diff --git a/lib_com/cldfb_fx.c b/lib_com/cldfb_fx.c
index 1cfb30d57266d4063ed3ae0f7a3a0c7fd008b90d..72a8281026020668a864ac8aec7ce8fa8459b0c8 100644
--- a/lib_com/cldfb_fx.c
+++ b/lib_com/cldfb_fx.c
@@ -595,6 +595,9 @@ void cldfbAnalysis_ts_fx_var_q(
     IF( NE_16( h_cldfb->Q_cldfb_state, *q_cldfb ) )
     {
         Word16 norm_st = L_norm_arr( timeBuffer_fx, offset );
+#ifdef FIX_2257_INCR_GUARD_BITS
+        norm_st = sub( norm_st, find_guarded_bits_fx( shr( h_cldfb->no_channels, 2 ) ) );
+#endif
         IF( GE_16( norm_st, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) ) )
         {
             scale_sig32( timeBuffer_fx, offset, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) );
diff --git a/lib_com/options.h b/lib_com/options.h
index 1b664c5a4887cc6c8449eb83f1e7ee6f7fa14cba..df55ff4732bb54ec08a0ed2fb440c59c556794e0 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -135,6 +135,7 @@
 #define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */
 #define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */
 #define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */
+#define FIX_2257_INCR_GUARD_BITS                        /* FhG: take correct rendering frame-size into account for guard-bits calculation */
 #define FIX_2297_SBA_SCALING_32KHZ                      /* VA: basop issue 2297: Fix scaling factor before the SBA decoder for output_Fs = 32 or 16 */
 
 /* ##################### End NON-BE switches ########################### */