diff --git a/include/satnogs/ax25.h b/include/satnogs/ax25.h
index d367bed..cabff44 100644
--- a/include/satnogs/ax25.h
+++ b/include/satnogs/ax25.h
@@ -31,7 +31,7 @@ namespace gr {
 
 namespace satnogs {
 const size_t AX25_MIN_ADDR_LEN = 14;
-const size_t AX25_MAX_ADDR_LEN = 28;
+const size_t AX25_MAX_ADDR_LEN = (2 * 7 + 8 * 7);
 const size_t AX25_MIN_CTRL_LEN = 1;
 const size_t AX25_MAX_CTRL_LEN = 2;
 const size_t AX25_MAX_FRAME_LEN = 256;
diff --git a/lib/ax25_decoder.cc b/lib/ax25_decoder.cc
index 476a5a4..1757da3 100644
--- a/lib/ax25_decoder.cc
+++ b/lib/ax25_decoder.cc
@@ -120,13 +120,8 @@ ax25_decoder::_decode(decoder_status_t &status)
          * AX.25 flag. We believe that such transmissions are yet rare.
          */
         bool have_sync = false;
-        if (d_descramble) {
-          have_sync = (d_shift_reg >> 8) == AX25_SYNC_FLAG;
-        }
-        else {
-          have_sync = ((d_shift_reg & 0xFF) == AX25_SYNC_FLAG)
-                      && (d_shift_reg >> 8) == AX25_SYNC_FLAG;
-        }
+        have_sync = ((d_shift_reg & 0xFF) == AX25_SYNC_FLAG)
+                    && (d_shift_reg >> 8) == AX25_SYNC_FLAG;
         if (have_sync) {
           d_bitstream.erase(d_bitstream.begin(),
                             d_bitstream.begin() + i + 1);