fix ticket 26