diff --git a/views_limit_grouping_style_plugin.inc b/views_limit_grouping_style_plugin.inc
index 63c67c6..c3b45eb 100755
--- a/views_limit_grouping_style_plugin.inc
+++ b/views_limit_grouping_style_plugin.inc
@@ -51,20 +51,33 @@ class views_limit_grouping_style_plugin extends views_plugin_style {
       foreach ($records as $index => $row) {
         $grouping = '';
         if (isset($this->view->field[$grouping_field])) {
-          $grouping = $this->get_field($index, $grouping_field);
+          $group_content = $this->get_field($index, $grouping_field);
           if ($this->view->field[$grouping_field]->options['label']) {
-            $grouping = $this->view->field[$grouping_field]->options['label'] . ': ' . $grouping;
+            $group_content = $this->view->field[$grouping_field]->options['label'] . ': ' . $group_content;
+          }
+          if ($group_rendered) {
+            $grouping = $group_content;
+          }
+          else {
+            $grouping = $this->get_field_value($index, $grouping_field);
+          }
+          if (empty($sets[$grouping]['group'])) {
+            $sets[$grouping]['group'] = $group_content;
           }
         }
-        $sets[$grouping][$index] = $row;
+        $sets[$grouping]['rows'][$index] = $row;
       }
     }
     else {
-      $sets[''] = $records;
+      $sets[''] = array(
+        'group' => '',
+        'rows' => $records,
+      );
     }
     // Apply the offset and limit.
     foreach ($sets as $group => $rows) {
-      $output[$group] = array_slice($rows, $this->options['grouping-offset'], $this->options['grouping-limit'], TRUE);
+      $output[$group]['group'] = $rows['group'];
+      $output[$group]['rows'] = array_slice($rows['rows'], $this->options['grouping-offset'], $this->options['grouping-limit'], TRUE);
     }
 
     return $output;
@@ -85,4 +98,4 @@ function grouping_validate($element, &$form_state) {
   if ($element['#value'] < 0) {
     form_error($element, t('%element cannot be negative.', array('%element' => $element['#title'])));
   }
-}
\ No newline at end of file
+}