Timepicker fix