diff --git a/spaces_og/plugins/space_og.inc b/spaces_og/plugins/space_og.inc
index 84f94e7..6e53316 100644
--- a/spaces_og/plugins/space_og.inc
+++ b/spaces_og/plugins/space_og.inc
@@ -186,11 +186,13 @@ class space_og extends space_type_purl {
     switch ($base_table) {
       case 'node':
         $table = $query->ensure_table('field_data_group_audience', $relationship);
-        $query->add_where(0, 'field_data_group_audience.group_audience_gid', $this->og->gid, '=');
+        //$query->add_where(0, 'field_data_group_audience.group_audience_gid', $this->og->gid, '=');
+        $query->add_where(0, $table.'.group_audience_gid', $this->og->gid, '=');
         break;
       case 'users':
         $table = $query->ensure_table('og_membership', $relationship);
-        $query->add_where(0, 'og_membership_users.gid', $this->og->gid);
+        //$query->add_where(0, 'og_membership_users.gid', $this->og->gid);
+        $query->add_where(0, $table.'.gid', $this->og->gid);
         break;
     }
   }