Fixed duplicate listeners
Fixed duplicate listeners