Fixed duplicate listeners