fix ticket 12