Index: flexinode.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flexinode/flexinode.module,v
retrieving revision 1.76
diff -u -r1.76 flexinode.module
--- flexinode.module	26 Apr 2006 11:24:29 -0000	1.76
+++ flexinode.module	27 Apr 2006 23:03:26 -0000
@@ -246,8 +246,7 @@
     $fieldname = 'flexinode_'. $field->field_id;
 
     $fields_to_select[] = flexinode_invoke('db_select', $field);
-    $table_joins[] = 'LEFT JOIN {flexinode_data} '. $fieldname .' ON n.nid = '. $fieldname .'.nid';
-    $where_clauses[] = $fieldname .'.field_id = '. $field->field_id;
+    $table_joins[] = 'LEFT JOIN {flexinode_data} '. $fieldname .' ON n.nid = '. $fieldname .'.nid AND ' . $fieldname .'.field_id = '. $field->field_id;
   }
 
   $type = 'flexinode-' . db_escape_string($ctype_id);