Fix issue with multiple notifications being sent