ticket_6: try to fix bug design