Fix TimePicker
Merge pull request #326 from marsuboss/fix-timepicker

Fix TimePicker