EventDispatcher Update

Minor bug fix