diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java b/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java
index 2c6a4cafd..7c8e708a1 100644
--- a/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java
+++ b/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/BinaryRowProtocol.java
@@ -276,7 +276,7 @@ public String getInternalString(ColumnInformation columnInfo, Calendar cal, Time
             case STRING:
                 if (getMaxFieldSize() > 0) {
                     return new String(buf, pos, Math.min(getMaxFieldSize() * 3, length), StandardCharsets.UTF_8)
-                            .substring(0, getMaxFieldSize());
+                            .substring(0, Math.min(getMaxFieldSize(),length));
                 }
                 return new String(buf, pos, length, StandardCharsets.UTF_8);
 
@@ -326,7 +326,7 @@ public String getInternalString(ColumnInformation columnInfo, Calendar cal, Time
             default:
                 if (getMaxFieldSize() > 0) {
                     return new String(buf, pos, Math.min(getMaxFieldSize() * 3, length), StandardCharsets.UTF_8)
-                            .substring(0, getMaxFieldSize());
+                            .substring(0, Math.min(getMaxFieldSize(),length));
                 }
                 return new String(buf, pos, length, StandardCharsets.UTF_8);
         }
diff --git a/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/TextRowProtocol.java b/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/TextRowProtocol.java
index 9958612be..642de89b5 100644
--- a/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/TextRowProtocol.java
+++ b/src/main/java/org/mariadb/jdbc/internal/com/read/resultset/rowprotocol/TextRowProtocol.java
@@ -221,7 +221,7 @@ public String getInternalString(ColumnInformation columnInfo, Calendar cal, Time
 
         if (maxFieldSize > 0) {
             return new String(buf, pos, Math.min(maxFieldSize * 3, length), StandardCharsets.UTF_8)
-                    .substring(0, maxFieldSize);
+                    .substring(0, Math.min(maxFieldSize, length));
         }
 
         return new String(buf, pos, length, StandardCharsets.UTF_8);
diff --git a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
index 400bd2db7..11f9faade 100644
--- a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
+++ b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
@@ -58,4 +58,4 @@ public final class Version {
     public static final int minorVersion = 2;
     public static final int patchVersion = 1;
     public static final String qualifier = "";
-}
\ No newline at end of file
+}