Corrected ticket #168