ticket 38 fixed