diff --git a/src/fw/modem b/src/fw/modem
index a014db79..c81ba8e0 160000
--- a/src/fw/modem
+++ b/src/fw/modem
@@ -1 +1 @@
-Subproject commit a014db79470cb22992bd9c8bc9faeb70a0874c58
+Subproject commit c81ba8e0cec74115d1e06b83a4af9edf475875e5
diff --git a/src/host/nxdn/Control.cpp b/src/host/nxdn/Control.cpp
index 50fca213..6320cc42 100644
--- a/src/host/nxdn/Control.cpp
+++ b/src/host/nxdn/Control.cpp
@@ -1141,7 +1141,7 @@ void Control::writeRF_Message_Tx_Rel(bool noNetwork)
         m_data->writeNetwork(data, NXDN_FRAME_LENGTH_BYTES + 2U);
 
     if (m_duplex) {
-        addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+        addFrame(data);
     }
 }
 
diff --git a/src/host/nxdn/packet/ControlSignaling.cpp b/src/host/nxdn/packet/ControlSignaling.cpp
index 586e4e2b..e313d116 100644
--- a/src/host/nxdn/packet/ControlSignaling.cpp
+++ b/src/host/nxdn/packet/ControlSignaling.cpp
@@ -366,7 +366,7 @@ void ControlSignaling::writeRF_Message(RCCH* rcch, bool noNetwork, bool imm)
         writeNetwork(data, NXDN_FRAME_LENGTH_BYTES + 2U);
 
     if (m_nxdn->m_duplex) {
-        m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U, imm);
+        m_nxdn->addFrame(data, false, imm);
     }
 }
 
@@ -762,7 +762,7 @@ void ControlSignaling::writeRF_CC_Message_Site_Info()
     NXDNUtils::addPostBits(data + 2U);
 
     if (m_nxdn->m_duplex) {
-        m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+        m_nxdn->addFrame(data);
     }
 }
 
@@ -805,6 +805,6 @@ void ControlSignaling::writeRF_CC_Message_Service_Info()
     NXDNUtils::addPostBits(data + 2U);
 
     if (m_nxdn->m_duplex) {
-        m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+        m_nxdn->addFrame(data);
     }
 }
diff --git a/src/host/nxdn/packet/Data.cpp b/src/host/nxdn/packet/Data.cpp
index b91f83fd..fe3d6370 100644
--- a/src/host/nxdn/packet/Data.cpp
+++ b/src/host/nxdn/packet/Data.cpp
@@ -235,7 +235,7 @@ bool Data::process(ChOption::E option, uint8_t* data, uint32_t len)
     writeNetwork(data, NXDN_FRAME_LENGTH_BYTES + 2U);
 
     if (m_nxdn->m_duplex) {
-        m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+        m_nxdn->addFrame(data);
     }
 
     m_nxdn->m_voice->m_rfFrames++;
@@ -341,7 +341,7 @@ bool Data::processNetwork(ChOption::E option, lc::RTCH& netLC, uint8_t* data, ui
     NXDNUtils::scrambler(data + 2U);
 
     if (m_nxdn->m_duplex) {
-        m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+        m_nxdn->addFrame(data, true);
     }
 
     m_nxdn->m_voice->m_netFrames++;
diff --git a/src/host/nxdn/packet/Voice.cpp b/src/host/nxdn/packet/Voice.cpp
index 0f046844..372b64ff 100644
--- a/src/host/nxdn/packet/Voice.cpp
+++ b/src/host/nxdn/packet/Voice.cpp
@@ -297,7 +297,7 @@ bool Voice::process(FuncChannelType::E fct, ChOption::E option, uint8_t* data, u
             data[0U] = type == MessageType::RTCH_TX_REL ? modem::TAG_EOT : modem::TAG_DATA;
             data[1U] = 0x00U;
 
-            m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+            m_nxdn->addFrame(data);
         }
 
         if (data[0U] == modem::TAG_EOT) {
@@ -483,7 +483,7 @@ bool Voice::process(FuncChannelType::E fct, ChOption::E option, uint8_t* data, u
                 start[0U] = modem::TAG_DATA;
                 start[1U] = 0x00U;
 
-                m_nxdn->addFrame(start, NXDN_FRAME_LENGTH_BYTES + 2U);
+                m_nxdn->addFrame(start);
             }
         }
     }
@@ -626,7 +626,7 @@ bool Voice::process(FuncChannelType::E fct, ChOption::E option, uint8_t* data, u
             data[0U] = modem::TAG_DATA;
             data[1U] = 0x00U;
 
-            m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+            m_nxdn->addFrame(data);
         }
 
         m_rfFrames++;
@@ -742,7 +742,7 @@ bool Voice::processNetwork(FuncChannelType::E fct, ChOption::E option, lc::RTCH&
             data[0U] = type == MessageType::RTCH_TX_REL ? modem::TAG_EOT : modem::TAG_DATA;
             data[1U] = 0x00U;
 
-            m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U, true);
+            m_nxdn->addFrame(data, true);
         }
 
         if (data[0U] == modem::TAG_EOT) {
@@ -903,7 +903,7 @@ bool Voice::processNetwork(FuncChannelType::E fct, ChOption::E option, lc::RTCH&
                 start[0U] = modem::TAG_DATA;
                 start[1U] = 0x00U;
 
-                m_nxdn->addFrame(start, NXDN_FRAME_LENGTH_BYTES + 2U, true);
+                m_nxdn->addFrame(start, true);
             }
         }
     }
@@ -1003,7 +1003,7 @@ bool Voice::processNetwork(FuncChannelType::E fct, ChOption::E option, lc::RTCH&
             data[0U] = modem::TAG_DATA;
             data[1U] = 0x00U;
 
-            m_nxdn->addFrame(data, NXDN_FRAME_LENGTH_BYTES + 2U);
+            m_nxdn->addFrame(data, true);
         }
 
         m_netFrames++;