EventDispatcher update to fix scope