Fix Date/Time parse