Picker: bug fix