fix ticket 35