Fixes #120, DatePicker test failures