Fixed duplicate alerts