diff --git a/lib_rend/ivas_omasa_ana_fx.c b/lib_rend/ivas_omasa_ana_fx.c
index d82346d34f2b45c2f27a887ccdf0f55264465306..84f1ff3dcd1f755a3d39848d7bb8d58a56f5f54c 100644
--- a/lib_rend/ivas_omasa_ana_fx.c
+++ b/lib_rend/ivas_omasa_ana_fx.c
@@ -451,8 +451,8 @@ static void ivas_omasa_param_est_ana_fx(
                 inp_q = data_f_q;
                 cldfbAnalysis_ts_fx_var_q( &( data_f_fx[i][i_mult( l_ts, ts )] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hOMasa->cldfbAnaEnc[i], &inp_q );
 
-                cr_q = s_min( cr_q, getScaleFactor32( Chnl_ImagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );
-                ci_q = s_min( ci_q, getScaleFactor32( Chnl_RealBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );
+                cr_q = s_min( cr_q, L_norm_arr( Chnl_ImagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );
+                ci_q = s_min( ci_q, L_norm_arr( Chnl_RealBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );
             }
             sf = sub( s_min( cr_q, ci_q ), 4 );
             FOR( i = 0; i < nchan_ism; i++ )
@@ -697,25 +697,25 @@ static void ivas_omasa_dmx_fx(
                     data_out_f_fx[j][k] = BASOP_Util_Add_Mant32Exp( data_out_f_fx[j][k], data_e[j], L_tmp, scale, &in_e[k] );
                     move32();
                 }
-            }
-            max_e = in_e[0];
-            move16();
-            FOR( l = 1; l < L_FRAME48k; l++ )
-            {
-                IF( LT_16( max_e, in_e[l] ) )
+                max_e = in_e[0];
+                move16();
+                FOR( l = 1; l < L_FRAME48k; l++ )
                 {
-                    max_e = in_e[l];
-                    move16();
+                    IF( LT_16( max_e, in_e[l] ) )
+                    {
+                        max_e = in_e[l];
+                        move16();
+                    }
                 }
-            }
 
-            FOR( l = 0; l < L_FRAME48k; l++ )
-            {
-                data_out_f_fx[j][l] = L_shr( data_out_f_fx[j][l], sub( max_e, in_e[l] ) ); // exponent: max_e, Q: ( 15 - max_e )
-                move32();
+                FOR( l = 0; l < L_FRAME48k; l++ )
+                {
+                    data_out_f_fx[j][l] = L_shr( data_out_f_fx[j][l], sub( max_e, in_e[l] ) ); // exponent: max_e, Q: ( 15 - max_e )
+                    move32();
+                }
+                data_e[j] = max_e;
+                move16();
             }
-            data_e[j] = max_e;
-            move16();
 
             prev_gains_fx[i][j] = L_deposit_h( gains_fx[j] ); // Q31
             move32();