Fix edge case on notification time