Listeners bug fixed