fix ticket 5