diff --git a/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc b/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
index 435db0d..d1ceadb 100644
--- a/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
+++ b/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
@@ -96,15 +96,16 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
         $query = db_select('taxonomy_term_data', 'td');
         $query->leftJoin('taxonomy_vocabulary', 'tv', 'td.vid = tv.vid');
         $query->fields('td');
+        $query->fields('tv', array('machine_name'));
         $query->condition('td.tid', $argument);
         $query->addTag('term_access');
-        $term = $query->execute()->fetchObject();
-        if (!$term) {
+        $row = $query->execute()->fetchObject();
+        if (!$row) {
           return FALSE;
         }
-        $term = taxonomy_term_load($term->tid);
+        $term = taxonomy_term_load($row->tid);
         $this->argument->validated_title = check_plain(entity_label('taxonomy_term', $term));
-        return empty($vocabularies) || !empty($vocabularies[$term->vocabulary_machine_name]);
+        return empty($vocabularies) || !empty($vocabularies[$row->machine_name]);
 
       case 'tids':
         // An empty argument is not a term so doesn't pass.
@@ -146,14 +147,14 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
 
           $result = $query->execute();
 
-          foreach ($result as $term) {
-            if ($vocabularies && empty($vocabularies[$term->machine_name])) {
-              $validated_cache[$term->tid] = FALSE;
+          foreach ($result as $row) {
+            if ($vocabularies && empty($vocabularies[$row->machine_name])) {
+              $validated_cache[$row->tid] = FALSE;
               return FALSE;
             }
-            $term = taxonomy_term_load($term->tid);
-            $titles[] = $validated_cache[$term->tid] = check_plain(entity_label('taxonomy_term', $term));
-            unset($test[$term->tid]);
+            $term = taxonomy_term_load($row->tid);
+            $titles[] = $validated_cache[$row->tid] = check_plain(entity_label('taxonomy_term', $term));
+            unset($test[$row->tid]);
           }
         }
 
@@ -179,13 +180,13 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
         else {
           $query->condition('td.name', $argument);
         }
-        $term = $query->execute()->fetchObject();
+        $row = $query->execute()->fetchObject();
 
-        if ($term && (empty($vocabularies) || !empty($vocabularies[$term->machine_name]))) {
+        if ($row && (empty($vocabularies) || !empty($vocabularies[$row->machine_name]))) {
           if ($type == 'convert') {
-            $this->argument->argument = $term->tid;
+            $this->argument->argument = $row->tid;
           }
-          $term = taxonomy_term_load($term->tid);
+          $term = taxonomy_term_load($row->tid);
           $this->argument->validated_title = check_plain(entity_label('taxonomy_term', $term));
           return TRUE;
         }
@@ -215,8 +216,8 @@ class views_plugin_argument_validate_taxonomy_term extends views_plugin_argument
         $query->addField('td', 'name', 'name');
       }
 
-      foreach ($query->execute()->fetchAllKeyed() as $tid => $term) {
-        $args[$arg_keys[$tid]] = $term;
+      foreach ($query->execute()->fetchAllKeyed() as $tid => $row) {
+        $args[$arg_keys[$tid]] = $row;
       }
     }
   }