Small fix to Picker logic