[PATCH 03/12] Changed per ticket #139.