Fix event_handler