notifications fix part 2/2