Fixed remove listener