Fixed multiple listeners bug from original repo