Fixed date field bug