fix ticket 24