diff --git a/lib_enc/ivas_mc_param_enc_fx.c b/lib_enc/ivas_mc_param_enc_fx.c
index 3058f87f3a6869903b2a51bb2be9f035c2742a43..7f74f78f922ecc40682f6bbe91214d0c9cd0376e 100644
--- a/lib_enc/ivas_mc_param_enc_fx.c
+++ b/lib_enc/ivas_mc_param_enc_fx.c
@@ -768,8 +768,8 @@ static void ivas_param_mc_param_est_enc_fx(
 
 #endif
 #ifdef MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE
-    sub35gb = sub( 35, find_guarded_bits_fx( l_ts ) );
-    sub62gb = sub( 62, find_guarded_bits_fx( l_ts ) );
+    sub35gb = sub( 32, sub( 11, find_guarded_bits_fx( l_ts ) ) );           // 31 - (((11 - gb) + 31 + norm) - 32)
+    sub62gb = sub( 63, shl( sub( 11, find_guarded_bits_fx( l_ts ) ), 1 ) ); // 31 - ((2*(11 - gb) + norm) - 32)
 #endif
 
     FOR( ts = start_ts; ts < num_time_slots; ts++ )