Picker bug fixed