diff --git a/DMRSlotRX.cpp b/DMRSlotRX.cpp
index 91f6b9f..944d072 100644
--- a/DMRSlotRX.cpp
+++ b/DMRSlotRX.cpp
@@ -376,8 +376,8 @@ uint16_t CDMRSlotRX::avgRSSI(uint16_t start, uint16_t count)
     rssi_tmp += (float) m_rssi[start];
 
     start++;
-    if (start >= DMO_BUFFER_LENGTH_SAMPLES)
-      start -= DMO_BUFFER_LENGTH_SAMPLES;
+    if (start >= 900U)
+      start -= 900U;
   }
 
   return (uint16_t) (rssi_tmp / count);
diff --git a/DMRSlotRX.h b/DMRSlotRX.h
index 11629d3..1a4376b 100644
--- a/DMRSlotRX.h
+++ b/DMRSlotRX.h
@@ -63,7 +63,7 @@ private:
   uint8_t     m_n;
   uint8_t     m_type;
   uint16_t    m_rssiCount;
-  uint16_t    m_rssi[DMO_BUFFER_LENGTH_SAMPLES];
+  uint16_t    m_rssi[900U];
 
   void correlateSync(bool first);
   void samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold);