eventdispatcher bug fix