CustomEventHandler fix