event_timestamp fix