Fixed duplicate notifications