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