Corrected ticket #118