--- token.node.inc.orig	2007-03-11 01:17:48.000000000 +0300
+++ token_node.inc	2007-03-20 17:43:08.000000000 +0300
@@ -48,6 +48,9 @@
       if (module_exists('taxonomy') && is_array($node->taxonomy) && count($node->taxonomy) > 0) {
         foreach ($node->taxonomy as $term) {
           if ($term) {
+	    if (!is_object($term)) {
+	      $term = taxonomy_get_term($term);
+	    }
             $values['term'] = $term->name;
             $values['term-id'] = $term->tid;