ticket 17 fixed