diff --git a/library.json b/library.json
index 2886f66d7..47c75dcc6 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
-  "name": "Firebase Arduino Client Library for ESP8266 and ESP32",
-  "version": "4.4.2",
+  "name": "Firebase Arduino Client Library",
+  "version": "4.4.3",
   "keywords": "communication, REST, esp32, esp8266, arduino",
   "description": "The library supports Firebase products e.g. Realtime database, Cloud Firestore database, Firebase Storage and Google Cloud Storage, Cloud Functions for Firebase and Cloud Messaging. The library also supported other Arduino devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.",
   "repository": {
diff --git a/library.properties b/library.properties
index 0960b575e..78dc698cc 100644
--- a/library.properties
+++ b/library.properties
@@ -1,6 +1,6 @@
 name=Firebase Arduino Client Library for ESP8266 and ESP32
 
-version=4.4.2
+version=4.4.3
 
 author=Mobizt
 
diff --git a/src/FB_Const.h b/src/FB_Const.h
index 2b57da1ba..a80e28400 100644
--- a/src/FB_Const.h
+++ b/src/FB_Const.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FB_Error.h b/src/FB_Error.h
index a6399a7e1..ad719e35b 100644
--- a/src/FB_Error.h
+++ b/src/FB_Error.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FB_Network.h b/src/FB_Network.h
index cec359d74..645929f09 100644
--- a/src/FB_Network.h
+++ b/src/FB_Network.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FB_Utils.h b/src/FB_Utils.h
index 0af9e05cc..2a8b8813b 100644
--- a/src/FB_Utils.h
+++ b/src/FB_Utils.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/Firebase.cpp b/src/Firebase.cpp
index 4d778d4f2..4aa65f448 100644
--- a/src/Firebase.cpp
+++ b/src/Firebase.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/Firebase.h b/src/Firebase.h
index 6cb087068..b7f1fde1b 100644
--- a/src/Firebase.h
+++ b/src/Firebase.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/FirebaseFS.h b/src/FirebaseFS.h
index 95d093af3..2f35811e2 100644
--- a/src/FirebaseFS.h
+++ b/src/FirebaseFS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/client/WiFiClientImpl.h b/src/client/WiFiClientImpl.h
index 99be542a3..9de0a5b3f 100644
--- a/src/client/WiFiClientImpl.h
+++ b/src/client/WiFiClientImpl.h
@@ -411,7 +411,7 @@ class WiFiClientImpl : public Client
 
     int tcpPeek()
     {
-        if (!_rxBuff || _fillPos == _fillSize && !fillRxBuffer())
+        if (!_rxBuff || (_fillPos == _fillSize && !fillRxBuffer()))
         {
             return -1;
         }
diff --git a/src/core/FirebaseCore.cpp b/src/core/FirebaseCore.cpp
index 11c454ade..9805847fb 100644
--- a/src/core/FirebaseCore.cpp
+++ b/src/core/FirebaseCore.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/core/FirebaseCore.h b/src/core/FirebaseCore.h
index c8a396462..70bb84686 100644
--- a/src/core/FirebaseCore.h
+++ b/src/core/FirebaseCore.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/core/Firebase_Client_Version.h b/src/core/Firebase_Client_Version.h
index 191d2c7bf..48d026969 100644
--- a/src/core/Firebase_Client_Version.h
+++ b/src/core/Firebase_Client_Version.h
@@ -1,6 +1,6 @@
 #ifndef FIREBASE_CLIENT_VERSION
-#define FIREBASE_CLIENT_VERSION "4.4.2"
-#define FIREBASE_CLIENT_VERSION_NUM 40402
+#define FIREBASE_CLIENT_VERSION "4.4.3"
+#define FIREBASE_CLIENT_VERSION_NUM 40403
 
 /* 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/firestore/FB_Firestore.cpp b/src/firestore/FB_Firestore.cpp
index 416c08141..5a3967043 100644
--- a/src/firestore/FB_Firestore.cpp
+++ b/src/firestore/FB_Firestore.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/firestore/FB_Firestore.h b/src/firestore/FB_Firestore.h
index 96b6f4d43..fcec422dc 100644
--- a/src/firestore/FB_Firestore.h
+++ b/src/firestore/FB_Firestore.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/functions/FB_Functions.cpp b/src/functions/FB_Functions.cpp
index 01da5d94e..0f37208a5 100644
--- a/src/functions/FB_Functions.cpp
+++ b/src/functions/FB_Functions.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/functions/FB_Functions.h b/src/functions/FB_Functions.h
index f4bf099c1..b42d61f09 100644
--- a/src/functions/FB_Functions.h
+++ b/src/functions/FB_Functions.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/functions/FunctionsConfig.cpp b/src/functions/FunctionsConfig.cpp
index 1cdacf3cb..bb8189e50 100644
--- a/src/functions/FunctionsConfig.cpp
+++ b/src/functions/FunctionsConfig.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/functions/FunctionsConfig.h b/src/functions/FunctionsConfig.h
index 9e46311d2..3cfc5278b 100644
--- a/src/functions/FunctionsConfig.h
+++ b/src/functions/FunctionsConfig.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/functions/PocicyBuilder.cpp b/src/functions/PocicyBuilder.cpp
index 5038dcc05..90bdf1c1b 100644
--- a/src/functions/PocicyBuilder.cpp
+++ b/src/functions/PocicyBuilder.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/functions/PolicyBuilder.h b/src/functions/PolicyBuilder.h
index 28af3f1d3..402ab9116 100644
--- a/src/functions/PolicyBuilder.h
+++ b/src/functions/PolicyBuilder.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/gcs/GCS.cpp b/src/gcs/GCS.cpp
index 37f12259a..7b053f6f6 100644
--- a/src/gcs/GCS.cpp
+++ b/src/gcs/GCS.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/gcs/GCS.h b/src/gcs/GCS.h
index 6fb343549..67b8993aa 100644
--- a/src/gcs/GCS.h
+++ b/src/gcs/GCS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/message/FCM.cpp b/src/message/FCM.cpp
index 0d4efc9e3..783a0c57e 100644
--- a/src/message/FCM.cpp
+++ b/src/message/FCM.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/message/FCM.h b/src/message/FCM.h
index 1dedbeeb5..1001ac210 100644
--- a/src/message/FCM.h
+++ b/src/message/FCM.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/message/LFCM.h b/src/message/LFCM.h
index cc5d05084..640a38591 100644
--- a/src/message/LFCM.h
+++ b/src/message/LFCM.h
@@ -1,6 +1,6 @@
 
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/FB_RTDB.cpp b/src/rtdb/FB_RTDB.cpp
index e7e00f6cd..ae34d863c 100644
--- a/src/rtdb/FB_RTDB.cpp
+++ b/src/rtdb/FB_RTDB.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/FB_RTDB.h b/src/rtdb/FB_RTDB.h
index d54a0f5db..be4bcd6a8 100644
--- a/src/rtdb/FB_RTDB.h
+++ b/src/rtdb/FB_RTDB.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueryFilter.cpp b/src/rtdb/QueryFilter.cpp
index 08db97165..76f3ae2b2 100644
--- a/src/rtdb/QueryFilter.cpp
+++ b/src/rtdb/QueryFilter.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueryFilter.h b/src/rtdb/QueryFilter.h
index bd645a2c2..2220f893c 100644
--- a/src/rtdb/QueryFilter.h
+++ b/src/rtdb/QueryFilter.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueInfo.cpp b/src/rtdb/QueueInfo.cpp
index 1478017d6..4d4ac4ba3 100644
--- a/src/rtdb/QueueInfo.cpp
+++ b/src/rtdb/QueueInfo.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueInfo.h b/src/rtdb/QueueInfo.h
index 26877fe1c..ccbac6d68 100644
--- a/src/rtdb/QueueInfo.h
+++ b/src/rtdb/QueueInfo.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueManager.cpp b/src/rtdb/QueueManager.cpp
index cb1dc7b12..e8309ca47 100644
--- a/src/rtdb/QueueManager.cpp
+++ b/src/rtdb/QueueManager.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/QueueManager.h b/src/rtdb/QueueManager.h
index e6fc1bd4c..c0e8c4032 100644
--- a/src/rtdb/QueueManager.h
+++ b/src/rtdb/QueueManager.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_MP_Stream.cpp b/src/rtdb/stream/FB_MP_Stream.cpp
index 0cbb3945d..dd106a89a 100644
--- a/src/rtdb/stream/FB_MP_Stream.cpp
+++ b/src/rtdb/stream/FB_MP_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_MP_Stream.h b/src/rtdb/stream/FB_MP_Stream.h
index 8f81f298d..213ecc039 100644
--- a/src/rtdb/stream/FB_MP_Stream.h
+++ b/src/rtdb/stream/FB_MP_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_Stream.cpp b/src/rtdb/stream/FB_Stream.cpp
index 9daf3d596..8697e4cb0 100644
--- a/src/rtdb/stream/FB_Stream.cpp
+++ b/src/rtdb/stream/FB_Stream.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/rtdb/stream/FB_Stream.h b/src/rtdb/stream/FB_Stream.h
index 650aed6bc..a95a0283f 100644
--- a/src/rtdb/stream/FB_Stream.h
+++ b/src/rtdb/stream/FB_Stream.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/session/FB_Session.cpp b/src/session/FB_Session.cpp
index 2a20e4cc9..249d8ee23 100644
--- a/src/session/FB_Session.cpp
+++ b/src/session/FB_Session.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/session/FB_Session.h b/src/session/FB_Session.h
index 1e1eaacfe..58b4403f5 100644
--- a/src/session/FB_Session.h
+++ b/src/session/FB_Session.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/storage/FCS.cpp b/src/storage/FCS.cpp
index ae4219b2e..158140d9e 100644
--- a/src/storage/FCS.cpp
+++ b/src/storage/FCS.cpp
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif
 
diff --git a/src/storage/FCS.h b/src/storage/FCS.h
index 0414a34a5..e778b7f43 100644
--- a/src/storage/FCS.h
+++ b/src/storage/FCS.h
@@ -1,5 +1,5 @@
 #include "./core/Firebase_Client_Version.h"
-#if !FIREBASE_CLIENT_VERSION_CHECK(40402)
+#if !FIREBASE_CLIENT_VERSION_CHECK(40403)
 #error "Mixed versions compilation."
 #endif