diff --git a/library.json b/library.json
index c4aa829..d28877c 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "TinyGSM",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "A small Arduino library for GPRS modules, that just works. Includes examples for Blynk, MQTT, File Download, and Web Client. Supports GSM modules with AT command interface: SIM800, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900, SIM900A, SIM900D, SIM908, SIM968",
   "keywords": "GSM, AT commands, AT, SIM800, SIM900, A6, A7, M590, ESP8266, SIM800A, SIM800C, SIM800L, SIM800H, SIM808, SIM868, SIM900A, SIM900D, SIM908, SIM968",
   "authors":
diff --git a/library.properties b/library.properties
index 5e26e9b..7762874 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=TinyGSM
-version=0.3.4
+version=0.3.5
 author=Volodymyr Shymanskyy
 maintainer=Volodymyr Shymanskyy
 sentence=A small Arduino library for GPRS modules, that just works.
diff --git a/src/TinyGsmClientXBee.h b/src/TinyGsmClientXBee.h
index 85282a0..dc88f0c 100644
--- a/src/TinyGsmClientXBee.h
+++ b/src/TinyGsmClientXBee.h
@@ -219,7 +219,7 @@ public:
   bool init() {
     guardTime = 1100;  // Start with a default guard time of 1 second
 
-    if (!commandMode()) return false;
+    if (!commandMode(10)) return false;  // Try up to 10 times for the init
 
     sendAT(GF("AP0"));  // Put in transparent mode
     bool ret_val = waitResponse() == 1;