diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 92d0139cbd5..e6d4ce51841 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -774,14 +774,14 @@ function taxonomy_node_get_terms_by_vocabulary($node, $vid, $key = 'tid') {
 function taxonomy_node_get_terms($node, $key = 'tid') {
   static $terms;
 
-  if (!isset($terms[$node->vid])) {
+  if (!isset($terms[$node->vid][$key])) {
     $result = db_query(db_rewrite_sql('SELECT t.* FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.vid = %d ORDER BY v.weight, t.weight, t.name', 't', 'tid'), $node->vid);
-    $terms[$node->vid] = array();
+    $terms[$node->vid][$key] = array();
     while ($term = db_fetch_object($result)) {
-      $terms[$node->vid][$term->$key] = $term;
+      $terms[$node->vid][$key][$term->$key] = $term;
     }
   }
-  return $terms[$node->vid];
+  return $terms[$node->vid][$key];
 }
 
 /**