[bug973112] - Modified eventListener