--- /sites/all/modules/cnr/corresponding_node_references.crud.inc	Do  4. Nov 22:53:34 2010
+++ /sites/all/modules/cnr/corresponding_node_references.crud.new.inc	Do  4. Nov 22:51:48 2010
@@ -23,8 +23,14 @@
       if (!empty($reference['nid'])) {
         // Load the referenced node if it is of the specified away type.
         if ($referenced_node = node_load(array('nid' => $reference['nid'], 'type' => $away_node_type))) {
-          // Add the new reference.
-          $referenced_node->{$away_field}[] = array('nid' => $home_node->nid);
+        	// If there are no other references, we need to make sure this is delta 0
+          if ($referenced_node->{$away_field}[0]['nid'] == NULL) {
+            $referenced_node->{$away_field}[0]['nid'] = $home_node->nid;
+          }
+          else {
+            // Add the new reference.
+            $referenced_node->{$away_field}[] = array('nid' => $home_node->nid);
+          }
           _corresponding_node_references_update($referenced_node);
         }
       }
@@ -99,7 +105,14 @@
           }
           // Add the new reference. Don't create a duplicate.
           if (!$exists) {
-            $referenced_node->{$away_field}[] = array('nid' => $home_node->nid);
+	          // If there are no other references, we need to make sure this is delta 0
+	          if ($referenced_node->{$away_field}[0]['nid'] == NULL) {
+	            $referenced_node->{$away_field}[0]['nid'] = $home_node->nid;
+	          }
+	          else {
+	            // Add the new reference.
+	            $referenced_node->{$away_field}[] = array('nid' => $home_node->nid);
+	          }
             _corresponding_node_references_update($referenced_node);
           }
         }