Multiple notifications fix