Fix event dispatcher