diff --git a/library.json b/library.json
index 283f59e5..52a5a934 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "Firebase ESP8266 Client",
-  "version": "4.3.14",
+  "version": "4.3.15",
   "keywords": "communication, REST, esp8266, arduino",
   "description": "The secure, fast and reliable Firebase Realtime database library to read, store, update, delete, listen, backup, and restore data. You can also read and modify the database security rules with this library.",
   "repository": {
diff --git a/library.properties b/library.properties
index b56b80fe..8a583f19 100644
--- a/library.properties
+++ b/library.properties
@@ -1,6 +1,6 @@
 name=Firebase ESP8266 Client
 
-version=4.3.14
+version=4.3.15
 
 author=Mobizt
 
diff --git a/src/FB_Const.h b/src/FB_Const.h
index 27ce28f4..7fa63245 100644
--- a/src/FB_Const.h
+++ b/src/FB_Const.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FB_Error.h b/src/FB_Error.h
index 9df1a06f..a2c2d080 100644
--- a/src/FB_Error.h
+++ b/src/FB_Error.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FB_Network.h b/src/FB_Network.h
index 8e4702ec..ccbc331f 100644
--- a/src/FB_Network.h
+++ b/src/FB_Network.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FB_Utils.h b/src/FB_Utils.h
index c9915c7b..12e3db6b 100644
--- a/src/FB_Utils.h
+++ b/src/FB_Utils.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
@@ -7,7 +7,7 @@
  *
  * This library supports Espressif ESP8266, ESP32 and Raspberry Pi Pico (RP2040)
  *
- * Created April 5, 2023
+ * Created July 7, 2023
  *
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -1414,6 +1414,9 @@ namespace Base64Helper
         size_t write = out.bufWrite;
         out.bufWrite = 0;
 
+        if (write == 0)
+            return true;
+
         if (out.outC && out.outC->write((uint8_t *)out.outT, write) == write)
             return true;
         else if (out.filetype != mb_fs_mem_storage_type_undefined && mbfs->write(mbfs_type out.filetype,
diff --git a/src/Firebase.cpp b/src/Firebase.cpp
index 662bfff8..a913e05d 100644
--- a/src/Firebase.cpp
+++ b/src/Firebase.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/Firebase.h b/src/Firebase.h
index 1b267ebe..195417dd 100644
--- a/src/Firebase.h
+++ b/src/Firebase.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h
index e8141f0f..4a92d3bb 100644
--- a/src/FirebaseFS.h
+++ b/src/FirebaseFS.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/Firebase_Client_Version.h b/src/Firebase_Client_Version.h
index 43205532..816e2b87 100644
--- a/src/Firebase_Client_Version.h
+++ b/src/Firebase_Client_Version.h
@@ -1,6 +1,6 @@
 #ifndef FIREBASE_CLIENT_VERSION
-#define FIREBASE_CLIENT_VERSION "4.3.14"
-#define FIREBASE_CLIENT_VERSION_NUM 40314
+#define FIREBASE_CLIENT_VERSION "4.3.15"
+#define FIREBASE_CLIENT_VERSION_NUM 40315
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 #define FIREBASE_CLIENT_VERSION_CHECK(ver) (ver == FIREBASE_CLIENT_VERSION_NUM)
diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
index 4673e37a..26b8f958 100644
--- a/src/rtdb/FB_RTDB.cpp
+++ b/src/rtdb/FB_RTDB.cpp
@@ -1,14 +1,14 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Realtime Database class, FB_RTDB.cpp version 2.0.15
+ * Google's Firebase Realtime Database class, FB_RTDB.cpp version 2.0.16
  *
  * This library supports Espressif ESP8266, ESP32 and RP2040 Pico
  *
- * Created June 14, 2023
+ * Created July 7, 2023
  *
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -2276,8 +2276,8 @@ bool FB_RTDB::encodeFileToClient(FirebaseData *fbdo, size_t bufSize, const MB_St
             break;
     }
 
-    // remaing data to wrire? write it
-    if (size == total && out.bufLen > 0)
+    // remainig data to wrire? write it
+    if (size == total && out.bufWrite > 0)
         Base64Helper::writeOutput(Signer.mbfs, out);
 
     MemoryHelper::freeBuffer(Signer.mbfs, data);
diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h
index 77956b7c..47ecd83b 100644
--- a/src/rtdb/FB_RTDB.h
+++ b/src/rtdb/FB_RTDB.h
@@ -1,14 +1,14 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
 /**
- * Google's Firebase Realtime Database class, FB_RTDB.h version 2.0.15
+ * Google's Firebase Realtime Database class, FB_RTDB.h version 2.0.16
  *
  * This library supports Espressif ESP8266, ESP32 and RP2040 Pico
  *
- * Created June 14, 2023
+ * Created July 7, 2023
  *
  * This work is a part of Firebase ESP Client library
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp
index 7aa05dc1..e22aa9f0 100644
--- a/src/rtdb/QueryFilter.cpp
+++ b/src/rtdb/QueryFilter.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h
index 93561e4f..99e73bb3 100644
--- a/src/rtdb/QueryFilter.h
+++ b/src/rtdb/QueryFilter.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp
index 98991e1c..ec2b3f8e 100644
--- a/src/rtdb/QueueInfo.cpp
+++ b/src/rtdb/QueueInfo.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h
index b989f830..352796e5 100644
--- a/src/rtdb/QueueInfo.h
+++ b/src/rtdb/QueueInfo.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp
index 7ccf21eb..a85c5e1b 100644
--- a/src/rtdb/QueueManager.cpp
+++ b/src/rtdb/QueueManager.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h
index 41f19ad3..36392bdb 100644
--- a/src/rtdb/QueueManager.h
+++ b/src/rtdb/QueueManager.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp
index 26703819..1654ad85 100644
--- a/src/rtdb/stream/FB_MP_Stream.cpp
+++ b/src/rtdb/stream/FB_MP_Stream.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h
index d425a12f..fda733ec 100644
--- a/src/rtdb/stream/FB_MP_Stream.h
+++ b/src/rtdb/stream/FB_MP_Stream.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp
index f0da103b..4d0c2077 100644
--- a/src/rtdb/stream/FB_Stream.cpp
+++ b/src/rtdb/stream/FB_Stream.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h
index 3496b6c4..e438c6ca 100644
--- a/src/rtdb/stream/FB_Stream.h
+++ b/src/rtdb/stream/FB_Stream.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp
index ddde9389..bb95cbdb 100644
--- a/src/session/FB_Session.cpp
+++ b/src/session/FB_Session.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h
index a2d0f39e..c1fb6769 100644
--- a/src/session/FB_Session.h
+++ b/src/session/FB_Session.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/signer/Signer.cpp b/src/signer/Signer.cpp
index 729a7b29..4ec24d23 100644
--- a/src/signer/Signer.cpp
+++ b/src/signer/Signer.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/signer/Signer.h b/src/signer/Signer.h
index 3a945071..dc58c910 100644
--- a/src/signer/Signer.h
+++ b/src/signer/Signer.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/wcs/FB_Clients.h b/src/wcs/FB_Clients.h
index c5bdeef8..d7a817b7 100644
--- a/src/wcs/FB_Clients.h
+++ b/src/wcs/FB_Clients.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/wcs/base/FB_TCP_Client_Base.h b/src/wcs/base/FB_TCP_Client_Base.h
index 8f3b40ef..0107affa 100644
--- a/src/wcs/base/FB_TCP_Client_Base.h
+++ b/src/wcs/base/FB_TCP_Client_Base.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/wcs/custom/FB_Custom_TCP_Client.h b/src/wcs/custom/FB_Custom_TCP_Client.h
index e1444612..2320ded9 100644
--- a/src/wcs/custom/FB_Custom_TCP_Client.h
+++ b/src/wcs/custom/FB_Custom_TCP_Client.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/wcs/esp32/FB_TCP_Client.cpp b/src/wcs/esp32/FB_TCP_Client.cpp
index 9e73f091..b82e2cc3 100644
--- a/src/wcs/esp32/FB_TCP_Client.cpp
+++ b/src/wcs/esp32/FB_TCP_Client.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/wcs/esp32/FB_TCP_Client.h b/src/wcs/esp32/FB_TCP_Client.h
index 99a8cfe7..5f62fd35 100644
--- a/src/wcs/esp32/FB_TCP_Client.h
+++ b/src/wcs/esp32/FB_TCP_Client.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/wcs/esp8266/FB_TCP_Client.cpp b/src/wcs/esp8266/FB_TCP_Client.cpp
index 8359d6f5..1209957d 100644
--- a/src/wcs/esp8266/FB_TCP_Client.cpp
+++ b/src/wcs/esp8266/FB_TCP_Client.cpp
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/wcs/esp8266/FB_TCP_Client.h b/src/wcs/esp8266/FB_TCP_Client.h
index 4e0820ba..510ffeea 100644
--- a/src/wcs/esp8266/FB_TCP_Client.h
+++ b/src/wcs/esp8266/FB_TCP_Client.h
@@ -1,5 +1,5 @@
 #include "Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40314)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40315)
 #error "Mixed versions compilation."
 #endif