Fixed dispatch bug, fixed event listener problem