Sort of fixed date time issue