diff --git a/lib_com/options.h b/lib_com/options.h
index 3c6148817b417321a5546dc1d63d603e0b32a232..25425b0ca8c22f87b28c56fb1c9e2f22f09d5fa3 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -104,6 +104,8 @@
 #define FIX_1348_BIT_PRECISION_IMPROVEMENT_QWIN
 #define FIX_1348_BIT_PRECISION_IMPROVEMENT_DYNAMIC_QOLD
 
+#define FIX_1802
+
 #define FIX_USAN_BASOP_UTIL_DIVIDE3232          /* Eri: Fix USAN error in BASOP_Util_Divide3232_Scale_newton by adding explicit type cast for -1 in hex */
 
 #define FIX_1740_MISING_POP_WMOPS               /* VA: fix issue 1740: missing pop_wmops() */
diff --git a/lib_dec/dec_tcx_fx.c b/lib_dec/dec_tcx_fx.c
index 6206577c104b4fa833b3a00f1aa3cc10a198addb..62db44e9651c65bdbe1c9b8f60f535bd6a66a1e7 100644
--- a/lib_dec/dec_tcx_fx.c
+++ b/lib_dec/dec_tcx_fx.c
@@ -3464,7 +3464,11 @@ void IMDCT_ivas_fx(
                     // sub( q_xn_buf_fx_32, q_win ) == 16 - L_norm_arr( xn_buf_fx_32, L_frame )
                     // q_xn_buf_fx_32 - q_win == 16 - L_norm_arr( xn_buf_fx_32, L_frame )
                     // q_win == - 16 + L_norm_arr( xn_buf_fx_32, L_frame ) + q_xn_buf_fx_32
+#ifdef FIX_1802
+                    q_win = s_min( q_win, add( sub( q_xn_buf_fx_32, 16 ), sub( L_norm_arr( xn_buf_fx_32 + ( overlap / 2 ) + nz, L_frame ), 2 ) ) );
+#else
                     q_win = s_min( q_win, add( sub( q_xn_buf_fx_32, 16 ), L_norm_arr( xn_buf_fx_32, L_frame ) ) - 2 );
+#endif
                 }
                 IMDCT_ivas_fx_rescale( xn_buf_fx, &q_xn_buf_fx, syn_Overl_TDAC_fx, Q_syn_Overl_TDAC_fx, old_syn_overl_fx, Q_old_syn_overl_fx, hTcxDec->old_syn_Overl, &hTcxDec->Q_old_syn_Overl, old_out_fx, q_old_out_fx, q_win, FB_flag );
 #endif