--- conditional_fields.module	2009-08-16 00:41:08.000000000 +0200
+++ patch/conditional_fields.module	2009-09-04 14:26:07.000000000 +0200
@@ -371,8 +371,15 @@ function conditional_fields_content_admi
       }
     }
     // - AND with Allowed values
-    if (!$allowed_values[$field['field_name']] = content_allowed_values($field)) {
-      continue;
+    if ($field['type'] == 'nodereference'){
+      if (!$allowed_values[$field['field_name']] = nodereference_allowed_values($field)) {
+        continue;
+      }
+    }
+    else {
+      if (!$allowed_values[$field['field_name']] = content_allowed_values($field)) {
+        continue;
+      }
     }
     $available_fields[$field['field_name']] = $field;
   }
@@ -484,8 +491,15 @@ function conditional_fields_fieldgroup_g
   foreach ($form['#content_type']['fields'] as $field) {
     $in_group = fieldgroup_get_group($form['#content_type']['type'], $field['field_name']);
     if (!$in_group) {
-      if ($allowed_values[$field['field_name']] = content_allowed_values($field)) {
-        $available_fields[$field['field_name']] = $field;
+      if ($field['type'] == 'nodereference'){
+        if ($allowed_values[$field['field_name']] = nodereference_allowed_values($field)) {
+          $available_fields[$field['field_name']] = $field;
+        }
+      }
+      else {
+        if ($allowed_values[$field['field_name']] = content_allowed_values($field)) {
+          $available_fields[$field['field_name']] = $field;
+        }
       }
     }
   }