Fixing Google Picker