Fix edge case on notification time (part 2)