Fix Date and Datetime field error