first try to solve ticket 137