TIme picker bug fix