diff --git a/src/modules/XBee/XBee.cpp b/src/modules/XBee/XBee.cpp
index 919de28e..d5d4b20c 100644
--- a/src/modules/XBee/XBee.cpp
+++ b/src/modules/XBee/XBee.cpp
@@ -3,9 +3,6 @@
 
 XBee::XBee(Module* mod) {
   _mod = mod;
-  _frameID = 0x01;
-  _frameLength = 0;
-  _frameHeaderProcessed = false;
 }
 
 int16_t XBee::begin(long speed) {
@@ -97,9 +94,9 @@ size_t XBee::available() {
     return(0);
   }
 
-  uint8_t header[3];
   if(!_frameHeaderProcessed) {
     // read frame header
+    uint8_t header[3];
     for(uint8_t i = 0; i < 3; i++) {
       header[i] = _mod->ModuleSerial->read();
     }
diff --git a/src/modules/XBee/XBee.h b/src/modules/XBee/XBee.h
index e9c970b2..15d7cb92 100644
--- a/src/modules/XBee/XBee.h
+++ b/src/modules/XBee/XBee.h
@@ -79,7 +79,7 @@ class XBeeSerial: public ISerial {
 
       \param panId 8-byte PAN ID to be used, in the form of uppercase hexadecimal string (i.e. 16 characters).
     */
-    int16_t setPanId(const char* panID);
+    int16_t setPanId(const char* panId);
 
 #ifndef RADIOLIB_GODMODE
   private:
@@ -170,22 +170,22 @@ class XBee {
 
       \param panId 8-byte PAN ID to be used, in the form of uppercase hexadecimal string (i.e. 16 characters).
     */
-    int16_t setPanId(uint8_t* panID);
+    int16_t setPanId(uint8_t* panId);
 
 #ifndef RADIOLIB_GODMODE
   private:
 #endif
     Module* _mod;
-    uint8_t _frameID;
-    size_t _frameLength;
-    bool _frameHeaderProcessed;
+    uint8_t _frameID = 0x01;
+    size_t _frameLength = 0;
+    bool _frameHeaderProcessed = false;
 
     #ifdef RADIOLIB_STATIC_ONLY
       char _packetData[RADIOLIB_STATIC_ARRAY_SIZE];
     #else
       char* _packetData = new char[0];
     #endif
-    uint8_t _packetSource[8];
+    uint8_t _packetSource[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
     int16_t confirmChanges();