Work on fixing multiple event listener issue.