diff --git a/taxonomy_token.module b/taxonomy_token.module
index a6e5614..75f833f 100644
--- a/taxonomy_token.module
+++ b/taxonomy_token.module
@@ -352,18 +352,17 @@ function taxonomy_token_token_values($type, $object = NULL) {
     while ($row_vocabs = db_fetch_array($result_vocabs)) {
       $vid = (int) $row_vocabs['vid'];
       $name = $row_vocabs['name'];
-      $query = db_query_range("
+      $query = db_query("
         SELECT td.tid, td.name
           FROM {term_node} tn
+            INNER JOIN {node} n
+              ON n.nid = tn.nid AND n.vid = tn.vid
             INNER JOIN {term_data} td
               ON tn.tid = td.tid
           WHERE td.vid = %d
-            AND tn.nid = %d
-          ORDER BY tn.vid DESC, td.weight, td.name",
+            AND tn.nid = %d",
         $vid,
         $node->nid,
-        0,
-        1
       );
       $result = db_fetch_array($query);
       $label = 'node:vocab:' . $vid;