diff --git a/plugins/views_plugin_query_default.inc b/plugins/views_plugin_query_default.inc
index 030c5ea..ed02fc6 100644
--- a/plugins/views_plugin_query_default.inc
+++ b/plugins/views_plugin_query_default.inc
@@ -1321,10 +1321,15 @@ class views_plugin_query_default extends views_plugin_query {
 
     if (count($this->having)) {
       $this->has_aggregate = TRUE;
+    }elseif($this->has_aggregate == FALSE){
+      $this->has_aggregate = $this->view->display_handler->options['group_by'];
     }
     if ($this->has_aggregate && (!empty($this->groupby) || !empty($non_aggregates))) {
       $groupby = array_unique(array_merge($this->groupby, $non_aggregates));
       foreach ($groupby as $field) {
+	    if($fields_array[$field]['table'] == NULL && $this->count_field['field'] != $fields_array[$field]['field']){
+            continue;
+        }
         $query->groupBy($field);
       }
       if (!empty($this->having) && $condition = $this->build_condition('having')) {