diff --git a/src/main/java/com/github/ibm/mapepire/requests/BlockRetrievableRequest.java b/src/main/java/com/github/ibm/mapepire/requests/BlockRetrievableRequest.java
index 00eed3c..f866337 100644
--- a/src/main/java/com/github/ibm/mapepire/requests/BlockRetrievableRequest.java
+++ b/src/main/java/com/github/ibm/mapepire/requests/BlockRetrievableRequest.java
@@ -131,7 +131,7 @@ protected static DataBlockFetchResult getNextDataBlock(final ResultSet _rs, fina
                 if (null == cellData) {
                     cellDataForResponse = null;
                 } else if (cellData instanceof CharSequence) {
-                    cellDataForResponse = cellData.toString().trim();
+                    cellDataForResponse = cellData.toString().replaceAll("\\s+$","");
                 } else if (cellData instanceof Number || cellData instanceof Boolean) {
                     cellDataForResponse = cellData;
                 } else {