Fix of TimePicker for issue #314

see #314 for details