--- ./views_calc_table.inc.orig	2010-04-20 19:27:44.000000000 +0000
+++ ./views_calc_table.inc	2010-04-20 20:42:09.000000000 +0000
@@ -99,7 +99,7 @@
     && !empty($this->view->pager['items_per_page'])) {
       $nids = array();
       foreach ($this->view->result as $delta => $value) {
-        $nids[] = $value->nid;
+        $nids[] = $value->{$this->view->base_field};
       }
       // Add sub_total rows to the results.
       foreach ($calc_fields as $calc => $field) {
@@ -181,7 +181,7 @@
     }
     // TODO This won't work right with relationships, need a fix here.
     if (!empty($this->view->views_calc_nids)) {
-      $this->view->query->add_where(NULL, "node.nid IN (%s)", implode(',', $this->view->views_calc_nids));
+      $this->view->query->add_where(NULL, "%s.%s IN (%s)", $this->view->base_table, $this->view->base_field, implode(',', $this->view->views_calc_nids));
     }
   }