diff --git a/lib_com/options.h b/lib_com/options.h
index 47582491e590969bc7f270c7fa995f7bef587733..ffa7dad2c445db5c6c45c7973baa47dce9e0bac5 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -96,6 +96,8 @@
 #define HARMONIZE_2494_FdCng_decodeSID_fx               /* FhG: harmonize FdCng_decodeSID_fx with _ivas_ version */
 #define FIX_BASOP_2509_EVS_CONCEAL_UNINIT_MEM           /* FhG: BASOP 2509: st->hTcxCfg->psychParamsCurrent is not initialized */
 #define HARMONIZE_2499_CONFIGUREFDCNGDEC                /* FhG: basop issue 2499: harmonoize configureFdCngDec */
+#define FIX_BASOP_2530_IVAS_DECISION_MAT                /* VA: Fix ambiguous usage of extract_l() */
+
 
 /* #################### End BE switches ################################## */
 
@@ -118,6 +120,7 @@
 #define FIX_BASOP_2522_MAP_PARAMS_DIRAC_STEREO          /* FhG: BASOP issue 2522: Fix copy and paste error for side_gain calculation in map_params_dirac_to_stereo() */
 #define FIX_2505_IVAS_DEC_SEGFAULT                      /* FhG: BASOP #2505: Add headroom to input of ivas_rend_crendProcessSubframe_fx() for ivas_mdft_fx() calculation */
 
+
 /* ##################### End NON-BE switches ########################### */
 
 /* ################## End MAINTENANCE switches ######################### */
diff --git a/lib_enc/ivas_decision_matrix_enc_fx.c b/lib_enc/ivas_decision_matrix_enc_fx.c
index a06ab899838297755bc177ec0f1d173287d74c9c..06e6723cf3b35d838251166ebd50c431cd0f1d4c 100644
--- a/lib_enc/ivas_decision_matrix_enc_fx.c
+++ b/lib_enc/ivas_decision_matrix_enc_fx.c
@@ -336,7 +336,11 @@ void ivas_decision_matrix_enc_fx(
                 st->extl = WB_BWE;
                 move16();
             }
+#ifdef FIX_BASOP_2530_IVAS_DECISION_MAT
+            ELSE IF( GE_32( st->total_brate, MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k )
+#else
             ELSE IF( GE_16( extract_l( st->total_brate ), MIN_BRATE_WB_BWE ) && !st->flag_ACELP16k )
+#endif
             {
                 test();
                 test();