sites/all/modules/contrib/views_calc/theme.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sites/all/modules/contrib/views_calc/theme.inc b/sites/all/modules/contrib/views_calc/theme.inc
index 7a6be39..7907daa 100644
--- a/sites/all/modules/contrib/views_calc/theme.inc
+++ b/sites/all/modules/contrib/views_calc/theme.inc
@@ -184,11 +184,14 @@ function template_preprocess_views_calc_table(&$vars) {
       $vars['fields'][$field] .= ' ' . drupal_clean_css_identifier($options['info'][$field]['align']);
     }
   }
-
+  // Fields must be rendered in order as of Views 2.3, so we will pre-render
+  // everything.
+  $renders = $handler->render_fields($result);
+  
   // Render each field into its appropriate column. Preserve rows.
   foreach ($result as $num => $row) {
     foreach ($columns as $field => $column) {
-      $field_output = $fields[$field]->theme($row);
+      $field_output = $renders[$num][$field];
       if (!empty($fields[$field]) && empty($fields[$field]->options['exclude'])) {
 
         // Don't bother with separators and stuff if the field does not show up.