diff --git a/includes/views_matrix.theme.inc b/includes/views_matrix.theme.inc
index 8fd0a5b..a1b8c3e 100644
--- a/includes/views_matrix.theme.inc
+++ b/includes/views_matrix.theme.inc
@@ -137,6 +137,9 @@ function template_preprocess_views_view_matrix(&$vars) {
   foreach (array_keys($rows_renders) as $yindex) {
     // Set the row header.
     $vars['rows'][$yindex]['header'] = $row_header[$yindex];
+    // Add row class for each row.
+    $vars['row_classes'][$yindex][] = ($xparity % 2 == 0) ? 'even' : 'odd';
+    $vars['row_classes'][$yindex][] = isset($options['row class']) ? views_css_safe($options['row class']) : '';
 
     $yparity = 0;
     // Fill in blank cells.
@@ -234,16 +237,6 @@ function template_preprocess_views_view_matrix(&$vars) {
 
     // Remove class views-matrix-empty
     $vars['rows'][$y_coordinate][$x_coordinate]['attributes']['class'] = array_diff($vars['rows'][$y_coordinate][$x_coordinate]['attributes']['class'], array('views-matrix-empty'));
-
-    // Calculate row classes by using the x coordinate. This will process
-    // multiple times.
-    $vars['row_classes'][$index] = array(
-      ($x_coordinate % 2 == 0) ? 'even' : 'odd',
-    );
-
-    if (!empty($options['row_class'])) {
-      $vars['row_classes'][$index][] = views_clean_css_identifier($options['row_class']);
-    }
   }
 }