diff --git a/lib_com/options.h b/lib_com/options.h
index 7e8d91b52e88297911762785a056dde4a46f13a3..16625f71954a720465959a77764a007ec53f8cad 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -136,6 +136,7 @@
 #define FIX_734_MISSING_SUBFR_LOW_RATE_ACELP
 #define FIX_747_TDBWE_ENERGY_BURST
 #define FIX_770_DISCONTINUITIES_SW_TCX2ACELP  // Fix discontinuities when switching from TCX to ACELP
+#define FIX_680_CNG_FRAME_BOUNDARIES_ISSUE /* Step was right shift by 2, which made the OVA wrong */
 /* ################## End DEVELOPMENT switches ######################### */
 
 /* clang-format on */
diff --git a/lib_dec/core_switching_dec_fx.c b/lib_dec/core_switching_dec_fx.c
index 7f349804be24d1eaeb999821fd8d748d009ecd78..f2a03ebc8b9b265111106f63d89b2eb360a0d1fc 100644
--- a/lib_dec/core_switching_dec_fx.c
+++ b/lib_dec/core_switching_dec_fx.c
@@ -2325,7 +2325,9 @@ static void smoothTransitionDtxToTcx_fx(
 
     /* apply fades around transition */
     step = div_s( 1, delay_comp );
+#ifndef FIX_680_CNG_FRAME_BOUNDARIES_ISSUE  /* Step has to be in Q15, not in Q13 */
     step = shr( step, 2 );
+#endif
     fade_in = extract_l( 0 );
     FOR( i = 0; i < delay_comp; i++ )
     {