fix event dispatcher