Event listeners issue fixed