Fix Picker issue