fix ticket 25, 31