listeners bug fixed