fix tickets sprint 9