Added a check to ensure we don't duplicate notifications