Date field bug fixed