diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index ab83779..c374e6a 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -1313,8 +1313,8 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
         }
         
         // remove extra columns
-        while (this.grid[0].length > columns) {
-            for (var i=0, l=this.grid.length; i<l; i++) {
+        for (var i=0, l=this.grid.length; i<l; i++) {
+            while (this.grid[i].length > columns) {
                 var row = this.grid[i];
                 var tile = row.pop();
                 this.destroyTile(tile);