Properly handle date field.