diff --git a/lib_com/options.h b/lib_com/options.h
index 5390fd919b424d1cbb634d663986f69f38f87b69..42bece45389515203cbdc7dda2bd84cfda22fa55 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -106,6 +106,7 @@
 #define HARMONIZE_2539_cng_energy                       /* FhG: basop issue 2539: harmonize cng_energy with its ivas derivate */
 #define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */
 #define FIX_BASOP_2573_RF_MODE_UPDATE                   /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */
+#define FIX_ISSUE_2579_CORRLAGMAX                       /* FhG: BASOP issue 2579: Non matching variable found in function unclr_calc_corr_features_fx()*/
 
 /* #################### End BE switches ################################## */
 
diff --git a/lib_enc/ivas_stereo_ica_enc_fx.c b/lib_enc/ivas_stereo_ica_enc_fx.c
index 234652072aafb5da36bdc5e843e522bd6928ad00..8940a78b43a756dea4b4203582f893badd4e13bb 100644
--- a/lib_enc/ivas_stereo_ica_enc_fx.c
+++ b/lib_enc/ivas_stereo_ica_enc_fx.c
@@ -2314,7 +2314,12 @@ static void unclr_calc_corr_features_fx(
     move32();
 
     /* L/R correlation values (zero lag, maximum) */
+#ifndef FIX_ISSUE_2579_CORRLAGMAX
     corrLagMax = maximum_l( corrEst, sub( lagSearchRange[1], add( lagSearchRange[0], 1 ) ), &corrEstMax );
+#else
+    corrLagMax = maximum_l( corrEst, sub( add( lagSearchRange[1], 1 ), lagSearchRange[0] ), &corrEstMax );
+#endif // !FIX_ISSUE_2579_CORRLAGMAX
+
     d_corrLagMax = sub( corrLagMax, hStereoClassif->unclr_corrLagMax_prev );
 
     hStereoClassif->unclr_fv_fx[E_d_corrLagMax] = L_shl( d_corrLagMax, 15 );