First try to solve ticket 137