fixed notifications issue