Fix TimePicker

See #314