Event listener fix