diff --git a/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar b/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar
index 5f8a5c3..f7aabf6 100644
Binary files a/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar and b/releases/tape-mybatis-generator-plugin-1.0-SNAPSHOT.jar differ
diff --git a/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java b/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java
index 18fd4ce..6316a14 100644
--- a/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java
+++ b/src/main/java/com/iqudoo/framework/mybatis/abstracts/AbstractWithLimitPlugin.java
@@ -81,7 +81,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I
                 "offset",
                 JavaVisibility.PROTECTED,
                 integerWrapper,
-                null
+                "null"
         );
         topLevelClass.addField(offsetField);
 
@@ -89,7 +89,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I
                 "rows",
                 JavaVisibility.PROTECTED,
                 integerWrapper,
-                null
+                "null"
         );
         topLevelClass.addField(rowsField);
 
@@ -139,6 +139,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I
         );
         setLimit = ElementTools.generateMethodBody(
                 setLimit,
+                "this.offset = null;",
                 "this.rows = rows;",
                 "return this;"
         );
@@ -205,7 +206,7 @@ public abstract class AbstractWithLimitPlugin extends PluginAdapter implements I
         getPageSize = ElementTools.generateMethodBody(
                 getPageSize,
                 "if (this.rows == null) {",
-                "return 0;",
+                "return this.ignorePageSize;",
                 "}",
                 "return this.rows;"
         );