Fix event listener