diff --git token.module token.module
index 316c072..980f9e5 100644
--- token.module
+++ token.module
@@ -343,7 +343,7 @@ function token_get_values($type = 'global', $object = NULL, $flush = FALSE, $opt
     $tokens['global']['default'] = module_invoke_all('token_values', 'global');
   }
 
-  $all = array_merge($tokens['global']['default'], $tokens[$type][$id]);
+  $all = array_merge($tokens['global']['default'], $tmp_tokens);
 
   $result = new stdClass();
   $result->tokens = array_keys($all);