diff --git a/lib_com/options.h b/lib_com/options.h
index 2c02fe5296a302dca06366c066997ba128d614d0..daa8ace9355ee177fdf20404cee66099b44d7246 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -162,6 +162,7 @@
 /*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */
 #define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */
 #define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */
+#define FIX_2274_OOB_INDEXING_IN_CORRMATRIX             /* FhG: fix OOB indexing complaint */
 #define FIX_2278_OOB_INDEXING_IN_CLOSED_LOOP_PIT_SEARCH /* FhG: fix oob indexing USAN complaint */
 #define FIX_2287_MCT_MDCT_STEREO_DATA_MALLOC_SIZE       /* FhG: correct allocation size for STEREO_MDCT_DEC_DATA struct */
 
diff --git a/lib_enc/enc_acelp.c b/lib_enc/enc_acelp.c
index 9d085392f513d7055e7c4570d98f3a21e4267b9c..75287a4d184f051e802db5c9e886a97b8bc6cf4b 100644
--- a/lib_enc/enc_acelp.c
+++ b/lib_enc/enc_acelp.c
@@ -492,7 +492,14 @@ static void E_ACELP_corrmatrix(
         p3 = &rrixiy[2][pos];
         p2 = &rrixiy[1][pos];
         p1 = &rrixiy[0][pos];
+#ifdef FIX_2274_OOB_INDEXING_IN_CORRMATRIX
+        p0 = &rrixiy[3][pos];
+        /* decrement pointer instead of indexing the array to avoid CLANG Usan complaint */
+        /* for last loop iteration, this points to rrixiy[3][-1], but is not actually accessed in later loop (k = 15 then, so inner loop will not run) */
+        p0 -= 16;
+#else
         p0 = &rrixiy[3][pos - 16];
+#endif
 
         cor = 0.0F;
         ptr_h1 = h;