added check inside stopListeningTo as well