fix ticket 27