Bug fix to Date/Time selectors