Bug fix for datepicker module!