Fixed duplicate listener