fixed initial_event_id handling