*** token_node.inc	2008-04-08 21:17:55.000000000 -0500
--- token_nodenew.inc	2008-08-27 11:45:23.000000000 -0500
***************
*** 143,148 ****
--- 143,155 ----
          $values['vocab-id'] = '';
        }
  
+ 	  $reqvocs = array_filter(taxonomy_get_vocabularies($node->type), create_function('$avoc','return $avoc->required == 1;'));
+ 	  foreach($reqvocs as $tokenvoc){
+ 		$lightterm = strtolower(db_result(db_query("SELECT t.name FROM {term_data} t INNER JOIN {term_node} r ON r.tid = t.tid WHERE t.vid = %d AND r.nid = %d ORDER BY weight LIMIT 1", $tokenvoc->vid, $object->nid)));
+ 		$values[strtolower($tokenvoc->name).'-raw'] = $lightterm;
+ 		$values[strtolower($tokenvoc->name)] = check_plain($lightterm);
+ 	  }
+ 	  
        break;
    }