Fix the events