Attempt to fix event dispatcher