Fix for EventDispatcher