Solve date field issue