diff --git a/lib_com/cldfb_fx.c b/lib_com/cldfb_fx.c
index 1cfb30d57266d4063ed3ae0f7a3a0c7fd008b90d..c681c8e510e1b2db37269b5b58944e7e427a788a 100644
--- a/lib_com/cldfb_fx.c
+++ b/lib_com/cldfb_fx.c
@@ -612,6 +612,14 @@ void cldfbAnalysis_ts_fx_var_q(
         }
     }
 
+#define CHECKHR_cldfbAnalysis_ts_fx_var_q_timebuffer
+#ifdef CHECKHR_cldfbAnalysis_ts_fx_var_q_timebuffer
+    for ( int mx = 0; mx < ( ( CLDFB_NO_CHANNELS_MAX * CLDFB_NO_COL_MAX ) + ( 9 * CLDFB_NO_CHANNELS_MAX ) ); mx++ )
+    {
+        // buffer_fx[mx] = MAXVAL_WORD32 >> 4; /*HR 4*/
+        assert( ( buffer_fx[mx] != 0 && norm_l( buffer_fx[mx] ) >= 4 ) || ( buffer_fx[mx] == 0 ) );
+    }
+#endif
     /* only process needed cols */
     IF( GT_16( samplesToProcess, -1 ) )
     {
diff --git a/lib_com/fft_cldfb_fx.c b/lib_com/fft_cldfb_fx.c
index 230dd7ac59f6cff002e6b472a4aab281f04083f8..af1207aed8e52baee53a12de24baa76da823da8c 100644
--- a/lib_com/fft_cldfb_fx.c
+++ b/lib_com/fft_cldfb_fx.c
@@ -613,6 +613,17 @@ static void fft30_with_cmplx_data( cmplx *inp /*Qx*/ )
 
     cmplx z[30], y[15], x[15], rs1, rs2, rs3, rs4, t;
 
+#define CHECKHR5_fft30_with_cmplx_data
+#ifdef CHECKHR5_fft30_with_cmplx_data
+    for ( int mx = 0; mx < 30; mx++ )
+    {
+        assert( ( inp[mx].re != 0 && norm_l( inp[mx].re ) >= 5 ) || inp[mx].re == 0 );
+        assert( ( inp[mx].im != 0 && norm_l( inp[mx].im ) >= 5 ) || inp[mx].im == 0 );
+        // inp[mx].im = MAXVAL_WORD32>>5;
+        // inp[mx].re = MAXVAL_WORD32>>5;
+    }
+#endif
+
     /* 1. FFT15 stage */
 
     x[0] = CL_shr( inp[0], SCALEFACTOR30_1 );
diff --git a/lib_enc/ivas_enc_fx.c b/lib_enc/ivas_enc_fx.c
index b206d8f8d338cb99a094ae8838200b6fc205df60..6a937582de631613306e5e7eab4dbe939fb4f01f 100644
--- a/lib_enc/ivas_enc_fx.c
+++ b/lib_enc/ivas_enc_fx.c
@@ -333,7 +333,7 @@ ivas_error ivas_enc_fx(
         {
             /* Scaling data_fx */
             {
-                Word16 norm_data_in = MAX16B;
+                Word16 norm_data_in = 31;
                 move16();
                 FOR( i = 0; i < hEncoderConfig->nchan_ism + st_ivas->nchan_transport; i++ )
                 {