fix to event service