ticket 1 fixed