--- query_old.inc	2009-11-02 23:56:44.000000000 +0100
+++ query.inc	2009-11-10 15:36:32.000000000 +0100
@@ -892,7 +892,7 @@ class views_query {
     if (empty($this->no_distinct) && $this->distinct && !empty($this->fields)) {
       if (!empty($this->fields[$this->base_field])) {
         $this->fields[$this->base_field]['distinct'] = TRUE;
-        $this->add_groupby($this->base_field);
+        $this->add_groupby($this->base_table .'.'. $this->base_field);
       }
     }
 
@@ -954,7 +954,7 @@ class views_query {
         $string = $GLOBALS['db_type'] == 'pgsql' ? "FIRST($string)" : $string;
       }
       else {
-        $non_aggregates[] = $fieldname;
+        $non_aggregates[] = $field['table'] . '.' . $field['field'];
       }
       if ($field['alias']) {
         $string .= " AS $field[alias]";