Fix multiple notifications issue