Fix next_event_time