diff --git a/lib_com/cldfb.c b/lib_com/cldfb.c
index 720ee37a03584ca9e89ab0b7d4cbdf9ff37aed78..6a9581498674393c2a698b645299d354c29f2a9c 100644
--- a/lib_com/cldfb.c
+++ b/lib_com/cldfb.c
@@ -901,7 +901,7 @@ void cldfbAnalysis_ts_fx_fixed_q(
     const Word16 *ptr_pf_fx;
     Word16 ptr_pf_sf;
     Word32 *timeBuffer_fx, buffer_fx[( CLDFB_NO_CHANNELS_MAX * CLDFB_NO_COL_MAX ) + ( 9 * CLDFB_NO_CHANNELS_MAX )];
-    Word16 offset, frameSize;
+    Word16 offset, frameSize, gb, hr, shift;
 
     offset = sub( h_cldfb->p_filter_length, h_cldfb->no_channels );
     frameSize = i_mult( h_cldfb->no_channels, h_cldfb->no_col );
@@ -1071,18 +1071,42 @@ void cldfbAnalysis_ts_fx_fixed_q(
         *q_cldfb = sub( *q_cldfb, 2 );
         move16();
 
+        gb = find_guarded_bits_fx( M1 );
+        hr = L_norm_arr( iBuffer_fx, M1 );
+
+        IF( LT_16( hr, gb ) )
+        {
+            scale_sig32( iBuffer_fx, M1, sub( hr, gb ) );
+        }
+
         /* FFT of DCT IV */
         fft_cldfb_fx( iBuffer_fx, M2 );
 
         /* post modulation of DCT IV */
-        FOR( k = 0; k < M2; k++ )
+        IF( LT_16( hr, gb ) )
         {
-            /* do it inplace */
-            /*cplxMult(&imagBuffer[2*k],&imagBuffer[M1-1-(2*k)],iBuffer[2*k],iBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
-            imagBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] );                  // q - 5
-            imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
-            move32();
-            move32();
+            shift = sub( gb, hr );
+            FOR( k = 0; k < M2; k++ )
+            {
+                /* do it inplace */
+                /*cplxMult(&imagBuffer[2*k],&imagBuffer[M1-1-(2*k)],iBuffer[2*k],iBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
+                imagBuffer_fx[2 * k] = L_shl( Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] ), shift );                  // q - 5
+                imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = L_shl( Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ), shift ); // q - 5
+                move32();
+                move32();
+            }
+        }
+        ELSE
+        {
+            FOR( k = 0; k < M2; k++ )
+            {
+                /* do it inplace */
+                /*cplxMult(&imagBuffer[2*k],&imagBuffer[M1-1-(2*k)],iBuffer[2*k],iBuffer[2*k+1],rot_vctr_re[k],rot_vctr_im[k]);*/
+                imagBuffer_fx[2 * k] = Msub_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_re_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_im_fx[k] );                  // q - 5
+                imagBuffer_fx[( M1 - 1 ) - ( k * 2 )] = Madd_32_32( Mpy_32_32( iBuffer_fx[2 * k], rot_vctr_im_fx[k] ), iBuffer_fx[2 * k + 1], rot_vctr_re_fx[k] ); // q - 5
+                move32();
+                move32();
+            }
         }
 
         IF( EQ_32( h_cldfb->prototype, CLDFB_PROTOTYPE_5_00MS ) )