Fixed duplicate notifications bug

Fixed duplicate notifications bug