Fix to event error