fixed EventDispatcher