Adding notification fixes