Fix for ListPicker