Fix bundle's EventDispatcher class