fix event_handler