Time picker fix