Fix EventDispatcher problem