Picker fix