Fix the event handling model