diff --git includes/database/select.inc includes/database/select.inc
index 1609106..5e2aee1 100644
--- includes/database/select.inc
+++ includes/database/select.inc
@@ -1362,13 +1362,15 @@ class SelectQuery extends Query implements SelectQueryInterface {
     // Create our new query object that we will mutate into a count query.
     $count = clone($this);
 
-    $group_by = array_keys($count->getGroupBy());
+    $group_by = drupal_map_assoc(array_values($count->getGroupBy()));
 
     if (!$count->distinct) {
       // When not executing a distinct query, we can zero-out existing fields
       // and expressions that are not used by a GROUP BY.  Fields listed in
       // the GROUP BY clause need to be present in the query.
       $fields =& $count->getFields();
+      dsm($fields);
+      dsm($group_by);
       foreach (array_keys($fields) as $field) {
         if (empty($group_by[$field])) {
           unset($fields[$field]);