diff --git a/package.json b/package.json
index 6d818c7..8976fd4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "LightPivotTable",
   "author": "ZitRo",
-  "version": "1.8.10",
+  "version": "1.8.11",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
   "repository": {
diff --git a/source/js/DataController.js b/source/js/DataController.js
index 29ef9bf..8e7ac97 100644
--- a/source/js/DataController.js
+++ b/source/js/DataController.js
@@ -538,21 +538,23 @@ DataController.prototype.resetRawData = function () {
         for (y = 0; y < rawData.length; y++) {
             for (x = 0; x < xEnd; x++) {
                 if (!rawData[y][x].isCaption) {
-                    xEnd = x; break;
+                    xEnd = x;
+                    break;
                 }
                 if (rawData[y][x].source && rawData[y][x].source["path"]) {
-                    for (i in formatColumn) {
+                    var formatCR = data.info.topHeaderRowsNumber > y ? formatColumn : formatRow;
+                    for (i in formatCR) {
                         if (rawData[y][x].source["path"].indexOf(i) >= 0) {
-                            var yy;
-                            for (yy = y; yy < rawData.length; yy++) {
-                                if (!rawData[yy][x].isCaption) {
-                                    if (formatColumn[i].style) rawData[yy][x].style = (rawData[yy][x].style || "")
-                                        + formatColumn[i].style || "";
+                            // var yy;
+                            // for (yy = y; yy < rawData.length; yy++) {
+                                if (!rawData[y][x].isCaption) {
+                                    if (formatCR[i].style) rawData[y][x].style = (rawData[y][x].style || "")
+                                        + formatCR[i].style || "";
                                 } else {
-                                    if (formatColumn[i].headStyle) rawData[yy][x].style = (rawData[yy][x].style || "")
-                                        + formatColumn[i].headStyle || "";
+                                    if (formatCR[i].headStyle) rawData[y][x].style = (rawData[y][x].style || "")
+                                        + formatCR[i].headStyle || "";
                                 }
-                            }
+                            // }
                             break;
                         }
                     }