fixed date time issue