diff --git a/Config.h b/Config.h
index 7b71272..560dc0d 100644
--- a/Config.h
+++ b/Config.h
@@ -19,7 +19,7 @@
 #if !defined(CONFIG_H)
 #define  CONFIG_H
 
-#define  WANT_DEBUG
+// #define  WANT_DEBUG
 
 // For the original Arduino Due pin layout
 #define  ARDUINO_DUE_PAPA
diff --git a/DMRTX.cpp b/DMRTX.cpp
index 812b33f..d6b7c04 100644
--- a/DMRTX.cpp
+++ b/DMRTX.cpp
@@ -170,18 +170,18 @@ uint8_t CDMRTX::writeShortLC(const uint8_t* data, uint8_t length)
 
   ::memset(m_newShortLC, 0x00U, 12U);
   
-  // Set the LCSS bits
-  m_newShortLC[1U]  = 0x08U;
-  m_newShortLC[4U]  = 0x88U;
-  m_newShortLC[7U]  = 0x88U;
-  m_newShortLC[11U] = 0x80U;
-
   for (uint8_t i = 0U; i < 68U; i++) {
     bool b = READ_BIT1(data, i);
     uint8_t n = CACH_INTERLEAVE[i];
     WRITE_BIT1(m_newShortLC, n, b);
   }
 
+  // Set the LCSS bits
+  m_newShortLC[1U]  |= 0x08U;
+  m_newShortLC[4U]  |= 0x88U;
+  m_newShortLC[7U]  |= 0x88U;
+  m_newShortLC[10U] |= 0x80U;
+
   return 0U;
 }