Correct date/time order