Fixed an issue with removeListener
Fixed an issue with removeListener