Timepicker fix²