--- theme/theme.inc	2009-08-06 18:29:18.000000000 -0700
+++ theme/theme.mod.inc	2009-08-06 18:28:30.000000000 -0700
@@ -95,6 +95,14 @@ function template_preprocess_calendar(&$
     $items[$num]->raw = $copy;
     
     foreach ($row as $key => $value) {
+      // HACK: handle field names that use relationships.
+      if ($field->options['relationship'] !== 'none') {
+        foreach ($calendar_fields as $cfield) {
+          if (is_numeric(strpos($key, $cfield))) {
+            $key = $cfield;
+          }
+        }
+      }
       if (in_array($key, $calendar_fields)) {
         $items[$num]->calendar_fields->$key = $value;
       }