References #2475: Fixed issue where one event listener can disrupt the rest of the listener chain.

(cherry picked from commit a3b2eabb52b7f90efae8b584de82edeeb042bff9)