diff --git a/openair1/PHY/TOOLS/nr_phy_qt_scope.cpp b/openair1/PHY/TOOLS/nr_phy_qt_scope.cpp
index 04e42873ea..fecfefd131 100644
--- a/openair1/PHY/TOOLS/nr_phy_qt_scope.cpp
+++ b/openair1/PHY/TOOLS/nr_phy_qt_scope.cpp
@@ -697,7 +697,7 @@ void PainterWidgetGnb::makeConnections(int type)
       break;
     }
     case PlotTypeGnb::CIR: {
-      newChart = new CIRPlot((complex16 *)p->gNB->pusch_vars[0]->ul_ch_estimates_time[0], frame_parms->ofdm_symbol_size);
+      newChart = new CIRPlot((complex16 *)p->gNB->pusch_vars[0].ul_ch_estimates_time[0], frame_parms->ofdm_symbol_size);
       break;
     }
 
@@ -705,12 +705,12 @@ void PainterWidgetGnb::makeConnections(int type)
       int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot;
       int Qm = 2;
       int coded_bits_per_codeword = num_re * Qm;
-      newChart = new LLRPlot((int16_t *)p->gNB->pusch_vars[0]->llr, coded_bits_per_codeword);
+      newChart = new LLRPlot((int16_t *)p->gNB->pusch_vars[0].llr, coded_bits_per_codeword);
       break;
     }
     case PlotTypeGnb::puschIQ: {
       int num_re = frame_parms->N_RB_UL * 12 * frame_parms->symbols_per_slot;
-      newChart = new IQPlot((complex16 *)p->gNB->pusch_vars[0]->rxdataF_comp[0], num_re);
+      newChart = new IQPlot((complex16 *)p->gNB->pusch_vars[0].rxdataF_comp[0], num_re);
       break;
     }
     case PlotTypeGnb::puschSNR: {
diff --git a/openair1/PHY/TOOLS/nr_phy_scope.c b/openair1/PHY/TOOLS/nr_phy_scope.c
index 5a4562cb58..206ed490e5 100644
--- a/openair1/PHY/TOOLS/nr_phy_scope.c
+++ b/openair1/PHY/TOOLS/nr_phy_scope.c
@@ -473,10 +473,10 @@ static void timeResponse (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) {
   int uestart = 0; // xforms scope designed to display nb_UEs signals
 #endif
   for (int ue = uestart; ue < nb_UEs; ue++) {
-    if ( p->gNB->pusch_vars && p->gNB->pusch_vars[ue] &&
-         p->gNB->pusch_vars[ue]->ul_ch_estimates_time &&
-         p->gNB->pusch_vars[ue]->ul_ch_estimates_time[ant] ) {
-      scopeSample_t *data= (scopeSample_t *)p->gNB->pusch_vars[ue]->ul_ch_estimates_time[ant];
+    if (p->gNB->pusch_vars &&
+        p->gNB->pusch_vars[ue].ul_ch_estimates_time &&
+        p->gNB->pusch_vars[ue].ul_ch_estimates_time[ant] ) {
+      scopeSample_t *data= (scopeSample_t *)p->gNB->pusch_vars[ue].ul_ch_estimates_time[ant];
 
       if (data != NULL) {
         for (int i=0; i<len; i++) {
@@ -527,10 +527,9 @@ static void puschLLR (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) {
   int coded_bits_per_codeword = num_re*Qm;
 
   for (int ue = uestart; ue < nb_UEs; ue++) {
-    if ( p->gNB->pusch_vars &&
-         p->gNB->pusch_vars[ue] &&
-         p->gNB->pusch_vars[ue]->llr ) {
-      int16_t *pusch_llr = (int16_t *)p->gNB->pusch_vars[ue]->llr;
+    if (p->gNB->pusch_vars &&
+        p->gNB->pusch_vars[ue].llr ) {
+      int16_t *pusch_llr = (int16_t *)p->gNB->pusch_vars[ue].llr;
       float *llr=NULL, *bit=NULL;
       int nx = coded_bits_per_codeword;
 #ifdef WEBSRVSCOPE
@@ -557,11 +556,10 @@ static void puschIQ (OAIgraph_t *graph, scopeData_t *p, int nb_UEs) {
   int uestart = 0; // xforms scope designed to display nb_UEs signals
 #endif
   for (int ue = uestart; ue < nb_UEs; ue++) {
-    if ( p->gNB->pusch_vars &&
-         p->gNB->pusch_vars[ue] &&
-         p->gNB->pusch_vars[ue]->rxdataF_comp &&
-         p->gNB->pusch_vars[ue]->rxdataF_comp[0] ) {
-      scopeSample_t *pusch_comp = (scopeSample_t *)p->gNB->pusch_vars[ue]->rxdataF_comp[0];
+    if (p->gNB->pusch_vars &&
+        p->gNB->pusch_vars[ue].rxdataF_comp &&
+        p->gNB->pusch_vars[ue].rxdataF_comp[0] ) {
+      scopeSample_t *pusch_comp = (scopeSample_t *)p->gNB->pusch_vars[ue].rxdataF_comp[0];
       float *I=NULL, *Q=NULL;
 #ifdef WEBSRVSCOPE
       newsz = websrv_cpiqbuff_tomsg(graph, pusch_comp, sz, 0, 0);