diff --git a/includes/database.inc b/includes/database.inc
index d43fd5ff2ab2c156f228fbf1d04e768e5d38e21d..744284ece93d057a44bed627987ba6ce171e1689 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -278,7 +278,7 @@ function db_rewrite_sql($query, $primary_table = 'n', $primary_field = 'nid',  $
   }
 
   if (!empty($join)) {
-    $query = preg_replace('|FROM[^[:upper:]/,]+|','\0 '. $join .' ', $query);
+    $query = preg_replace('|FROM[^[:upper:]/,_]+|','\0 '. $join .' ', $query);
   }
 
   if (!empty($where)) {