Fixed date picker field issue