diff --git a/src/models/statement.base.ts b/src/models/statement.base.ts
index e572791..15b350d 100644
--- a/src/models/statement.base.ts
+++ b/src/models/statement.base.ts
@@ -77,6 +77,7 @@ export abstract class StatementBase implements AfterViewInit, OnInit {
         this.showGrid = true;
         this.gridOptions.rowModelType = 'virtual';
         this.gridOptions.paginationPageSize = 10;
+        this.gridOptions.maxPagesInCache = 20;
         this.gridOptions.getRowNodeId = function(item) {
             return item.id;
         };
diff --git a/src/services/statement.base.service.ts b/src/services/statement.base.service.ts
index 638823f..c32c3d9 100644
--- a/src/services/statement.base.service.ts
+++ b/src/services/statement.base.service.ts
@@ -33,8 +33,8 @@ export abstract class StatementBaseService {
                       data = [this.createModel()];
                   }
                 let lastRow: number = -1;
-                if (data.length < (params.endRow - params.startRow)) {
-                      lastRow = data.length;
+                if (data.length < (params.endRow-params.startRow)) {
+                      lastRow = params.startRow+data.length;
                   }
                 params.successCallback(data, lastRow);
                 return data;
--
libgit2 0.21.4