fix sprint 7 tickets