fixing bugs with multiple notifications