Timepicker issue fix