--- token.module-old	2011-01-10 00:17:32.000000000 +0100
+++ token.module	2011-01-10 00:27:27.000000000 +0100
@@ -343,7 +343,7 @@
     $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);