Fix CustomEventsDispatcher