Take Null times into account