diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index c447708125..30e1d2cc3d 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -408,7 +408,7 @@ void nr_preprocessor_phytest(module_id_t module_id,
 
   /* mark the corresponding RBs as used */
   for (int rb = 0; rb < sched_pdsch->rbSize; rb++)
-    vrb_map[rb + sched_pdsch->rbStart + BWPStart] = ((1<<ps->nrOfSymbols)-1)<<ps->startSymbolIndex;
+    vrb_map[rb + sched_pdsch->rbStart + BWPStart] = SL_to_bitmap(ps->startSymbolIndex, ps->nrOfSymbols);
 
   if ((frame&127) == 0) LOG_D(MAC,"phytest: %d.%d DL mcs %d, DL rbStart %d, DL rbSize %d\n", frame, slot, sched_pdsch->mcs, rbStart,rbSize);
 }
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 89e8d344ed..8f1bc986fe 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -376,14 +376,7 @@ void fill_pdcch_vrb_map(gNB_MAC_INST *mac,
 
   for (int j=first_cce; j<first_cce+aggregation; j++) { // loop over CCEs
     for (int k=6*j/L; k<(6*j/L+6/L); k++) { // loop over REG bundles
-      int f;  // interleaving function
-      if(R==0)
-        f = k;
-      else {
-        int c = k/R;
-        int r = k%R;
-        f = (r*C + c + n_shift)%(N_regs/L);
-      }
+      int f = cce_to_reg_interleaving(R, k, n_shift, C, L, N_regs);
       for(int rb=0; rb<B_rb; rb++) // loop over the RBs of the bundle
         vrb_map[pdcch->BWPStart + f*B_rb + rb] |= SL_to_bitmap(pdcch->StartSymbolIndex, N_symb);
     }