Bugfix for datepicker and timepicker