Fixed date picker issue