notifications fix part 1/2