fix for date picker issue