event dispatcher fix