Fixed event_id issue