Solve Date picker problem