diff --git a/lib_com/gs_gains_fx.c b/lib_com/gs_gains_fx.c
index e84336385c3a29c1783e912cbaade1fe46edb9f4..3f4edb7ff2223823998130b64c1e5889d6aa6b72 100644
--- a/lib_com/gs_gains_fx.c
+++ b/lib_com/gs_gains_fx.c
@@ -50,7 +50,7 @@ static Word16 VDQ_vec_fx( Word16 *Qvec_out_fx, const Word16 *mean_dic_fx, const
 
 
 /*========================================================================*/
-/* FUNCTION : void Comp_and_apply_gain_enc_fx                             */
+/* FUNCTION : void Comp_and_apply_gain_fx                                 */
 /*------------------------------------------------------------------------*/
 /* PURPOSE :  Compute and apply the quantized per band gain               */
 /*------------------------------------------------------------------------*/
@@ -473,7 +473,7 @@ static void GSC_gain_adj(
     }
     ELSE
     {
-        Gain_off = 0;
+        Gain_off = 0; /* For higher bitrate, thus for L_frame == L_FRAME16k as well */
         move16();
 
         test();
@@ -511,7 +511,11 @@ static void GSC_gain_adj(
         }
 
         /*mimic ACELP decay of energy for low rates*/
+#ifndef FIX_2406_FIX_GAIN_ON_INACTIVE
         FOR( i = 0; i < MBANDS_GN; i++ )
+#else
+        FOR( i = 0; i < Mbands_gn; i++ )
+#endif
         {
             old_y_gain[i] = y_gain_tmp[i];
             move16();
@@ -526,7 +530,7 @@ static void GSC_gain_adj(
 
 
 /*==========================================================================*/
-/* FUNCTION : Word16 gsc_gaindec_ivas_fx()                                  */
+/* FUNCTION : Word16 gsc_gaindec_fx()                                       */
 /*--------------------------------------------------------------------------*/
 /* PURPOSE  :  Generic signal frequency band decoding and application       */
 /*--------------------------------------------------------------------------*/
diff --git a/lib_com/options.h b/lib_com/options.h
index 027a323d11a145c228284ade3bef2fc6eec280fa..2bae544656cd01cecc1508f86cbf99eb143ac2c5 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -102,6 +102,7 @@
 #define FIX_2396_CONSTANT_STRIDE_IN_TC_BUFFER           /* FhG/VA: basop issue 2396: keep TC channel pointers in one constant place during decoding and rendering */
 #define FIX_2408_FD_BWE_UPDATE                          /* VA: basop issue 2408: bug-fix in the FD BWE memory updates in wb_pre_proc_ivas_fx()  */
 #define FIX_2380_HARM_GSC_GAIN_COMP_FX                  /* VA: basop issue 2380 & 2381: Fix issue when switching from CNG low energy to active content with high energy */
+#define FIX_2406_FIX_GAIN_ON_INACTIVE                   /* VA: basop issue 2406: gain between 6.4 and 8kHz was too weak during inactive content with Fs=16kHz  */
 
 /* ##################### End NON-BE switches ########################### */