ticket 15 fix