Fixed dispatch events