Fix Date issue.