diff --git a/openair1/PHY/MODULATION/beamforming.c b/openair1/PHY/MODULATION/beamforming.c
index 1416ce2daa..0aaa00da4b 100644
--- a/openair1/PHY/MODULATION/beamforming.c
+++ b/openair1/PHY/MODULATION/beamforming.c
@@ -104,7 +104,7 @@ int nr_beam_precoding(int32_t **txdataF,
 
   uint8_t p;
   int slot_offset_F;
-  int nb_antenna_ports = 1; // TODO get the actual value
+  int nb_antenna_ports = frame_parms->Lmax; // for now logical antenna ports corresponds to SSB
   
   slot_offset_F = slot*(frame_parms->ofdm_symbol_size)*(frame_parms->symbols_per_slot);
 
diff --git a/openair1/SCHED_NR/nr_ru_procedures.c b/openair1/SCHED_NR/nr_ru_procedures.c
index 493527d09c..36e4cb13f8 100644
--- a/openair1/SCHED_NR/nr_ru_procedures.c
+++ b/openair1/SCHED_NR/nr_ru_procedures.c
@@ -257,7 +257,8 @@ void nr_feptx_prec(RU_t *ru,int frame,int tti_tx) {
     VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_RU_FEPTX_PREC , 0);
   }
   else {
-    bw  = ru->beam_weights[0];
+
+    bw  = ru->nrbeam_weights[0];
     for (l=0;l<fp->symbols_per_slot;l++) {
       for (aa=0;aa<ru->nb_tx;aa++) {
 	nr_beam_precoding(ru->gNB_list[0]->common_vars.txdataF,