ticket 11 fixed