Fix event_id bug