diff --git a/README.md b/README.md
index f2a96ae4..74f9ac93 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,12 @@
-# node-oracledb version 6.4.0
+# node-oracledb version 6.5.0-dev
+
+**This release is under development and information may be incomplete**
 
 The node-oracledb add-on for Node.js powers high performance Oracle Database
 applications.  Applications can be written in TypeScript, or directly in
 JavaScript.
 
-Use node-oracledb 6.4.0 to connect Node.js 14.6, or later, to Oracle
+Use node-oracledb 6.5.0-dev to connect Node.js 14.6, or later, to Oracle
 Database.  Older versions of node-oracledb may work with older versions of
 Node.js.
 
diff --git a/lib/version.js b/lib/version.js
index 543ed09a..13ec545c 100644
--- a/lib/version.js
+++ b/lib/version.js
@@ -30,7 +30,7 @@
 
 module.exports = {
   VERSION_MAJOR: 6,
-  VERSION_MINOR: 4,
+  VERSION_MINOR: 5,
   VERSION_PATCH: 0,
-  VERSION_SUFFIX: ''
+  VERSION_SUFFIX: '-dev'
 };
diff --git a/package.json b/package.json
index 6ddee1f7..448a6e7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "6.4.0",
+  "version": "6.5.0-dev",
   "description": "A Node.js module for Oracle Database access from JavaScript and TypeScript",
   "license": "(Apache-2.0 OR UPL-1.0)",
   "homepage": "http://oracle.github.io/node-oracledb/",
diff --git a/src/njsLob.c b/src/njsLob.c
index e3e9820c..065b2528 100644
--- a/src/njsLob.c
+++ b/src/njsLob.c
@@ -223,8 +223,8 @@ static bool njsLob_getDataAsync(njsBaton *baton)
             return njsBaton_setErrorDPI(baton);
         lob->dirtyLength = false;
     }
-    len = lob->length;
-    if ((baton->lobAmount == 0) || (baton->lobAmount >= lob->length)) {
+    len = baton->lobAmount;
+    if ((len == 0) || (len >= lob->length)) {
         // If user has not given lobAmount or user gave greater than
         // lob length, adjust the len value.
         if (lob->length >= baton->lobOffset) {
@@ -232,8 +232,6 @@ static bool njsLob_getDataAsync(njsBaton *baton)
         } else {
             len = 1;
         }
-    } else {
-        len = baton->lobAmount;
     }
 
     // determine size of buffer that is required