Fixed another event listener bug