Customer version to fix date picker issue