=== modified file 'includes/database.inc'
--- includes/database.inc	
+++ includes/database.inc	
@@ -280,7 +280,7 @@ function db_rewrite_sql($query, $primary
   if ($distinct) {
     $field_to_select = 'DISTINCT('. $primary_table .'.'. $primary_field .')';
     // (?<!text) is a negative look-behind (no need to rewrite queries that already use DISTINCT).
-    $query = preg_replace('/(SELECT.*)('. $primary_table .'\.)?(?<!DISTINCT\()(?<!DISTINCT\('. $primary_table .'\.)'. $primary_field .'(.*FROM)/AUsi', '\1'. $field_to_select .'\3', $query);
+    $query = preg_replace('/(SELECT.*)('. $primary_table .'\.)?(?<!DISTINCT\()(?<!DISTINCT\('. $primary_table .'\.)'. $primary_field .'(.*FROM )/AUsi', '\1'. $field_to_select .'\3', $query);
   }
 
   if (!empty($where) || !empty($join)) {