diff --git a/TinyGsmClient.h b/TinyGsmClient.h
index cb2fa08..421914c 100644
--- a/TinyGsmClient.h
+++ b/TinyGsmClient.h
@@ -9,7 +9,7 @@
 #ifndef TinyGsmClient_h
 #define TinyGsmClient_h
 
-#if   defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM900)
+#if defined(TINY_GSM_MODEM_SIM800) || defined(TINY_GSM_MODEM_SIM900)
   #include <TinyGsmClientSIM800.h>
 #elif defined(TINY_GSM_MODEM_A6) || defined(TINY_GSM_MODEM_A7)
   #include <TinyGsmClientA6.h>
diff --git a/TinyGsmClientXBee.h b/TinyGsmClientXBee.h
index adb7546..e88f43d 100644
--- a/TinyGsmClientXBee.h
+++ b/TinyGsmClientXBee.h
@@ -98,7 +98,7 @@ public:
     at->exitCommand();
     at->modemSend("", 1, mux);
     at->waitResponse();
-    delay(100);
+    at->waitResponse();  // To clear the buffer
     at->commandMode();
     at->sendAT(GF("TM64"));  // Set socket timeout back to 10seconds;
     at->waitResponse();