Index: nat.module
===================================================================
--- nat.module	1 Mar 2009 07:27:51 -0000	1.34.2.18
+++ nat.module	24 Jul 2009 18:31:54 -0000
@@ -85,8 +85,17 @@ function nat_nodeapi(&$node, $op, $tease
       $node->nat = nat_get_terms($node->nid);
       break;
     case 'insert':
-      // Add term(s).
-      $terms = _nat_add_terms($node);
+      if (isset($node->nat)) {
+        // Use supplied terms, casting each as an array
+        $terms = array();
+        foreach ($node->nat as $term) {
+          $terms[] = (array) $term;
+        }
+      }
+      else {
+        // Add term(s).
+        $terms = _nat_add_terms($node);
+      }
 
       // Save node-term association in the NAT table.
       _nat_save_association($node->nid, $terms);