diff --git a/srsue/hdr/phy/prach.h b/srsue/hdr/phy/prach.h
index 2872c374c..8218ca644 100644
--- a/srsue/hdr/phy/prach.h
+++ b/srsue/hdr/phy/prach.h
@@ -49,7 +49,7 @@ namespace srsue {
       target_power_dbm  = 0;
       mem_initiated     = false;
       cell_initiated    = false;
-      bzero(signal_buffer, sizeof(signal_buffer));
+      signal_buffer     = NULL;   
     }
     ~prach();
     void           init(LIBLTE_RRC_PRACH_CONFIG_SIB_STRUCT *config, uint32_t max_prb, phy_args_t *args, srslte::log *log_h);
@@ -78,7 +78,7 @@ namespace srsue {
     srslte_prach_t prach_obj; 
     int            transmitted_tti;
     srslte_cell_t  cell;
-    cf_t          *signal_buffer[SRSLTE_MAX_PORTS];
+    cf_t          *signal_buffer;
     srslte_cfo_t   cfo_h; 
     float target_power_dbm;
     
diff --git a/srsue/src/phy/prach.cc b/srsue/src/phy/prach.cc
index bd7550457..182a66aa7 100644
--- a/srsue/src/phy/prach.cc
+++ b/srsue/src/phy/prach.cc
@@ -75,12 +75,10 @@ void prach::init(LIBLTE_RRC_PRACH_CONFIG_SIB_STRUCT *config_, uint32_t max_prb,
     return;
   }
   srslte_cfo_set_tol(&cfo_h, 0);
-  for (int p = 0; p < SRSLTE_MAX_PORTS; p++) {
-    signal_buffer[p] = (cf_t *) srslte_vec_malloc(SRSLTE_PRACH_MAX_LEN * sizeof(cf_t));
-    if (!signal_buffer[p]) {
-      perror("malloc");
-      return;
-    }
+  signal_buffer = (cf_t *) srslte_vec_malloc(SRSLTE_PRACH_MAX_LEN * sizeof(cf_t));
+  if (!signal_buffer) {
+    perror("malloc");
+    return;
   }
   if (srslte_prach_init(&prach_obj, srslte_symbol_sz(max_prb))) {
     Error("Initiating PRACH library\n");
@@ -184,7 +182,7 @@ void prach::send(srslte::radio *radio_handler, float cfo, float pathloss, srslte
   float old_gain = radio_handler->get_tx_gain(); 
   
   // Correct CFO before transmission FIXME: UL SISO Only
-  srslte_cfo_correct(&cfo_h, buffer[preamble_idx], signal_buffer[0], cfo / srslte_symbol_sz(cell.nof_prb));
+  srslte_cfo_correct(&cfo_h, buffer[preamble_idx], signal_buffer, cfo / srslte_symbol_sz(cell.nof_prb));
 
   // If power control is enabled, choose amplitude and power 
   if (args->ul_pwr_ctrl_en) {
@@ -195,10 +193,10 @@ void prach::send(srslte::radio *radio_handler, float cfo, float pathloss, srslte
     radio_handler->set_tx_power(tx_power);
         
     // Scale signal
-    float digital_power = srslte_vec_avg_power_cf(signal_buffer[0], len);
+    float digital_power = srslte_vec_avg_power_cf(signal_buffer, len);
     float scale = sqrtf(pow(10,tx_power/10)/digital_power);
     
-    srslte_vec_sc_prod_cfc(signal_buffer[0], scale, signal_buffer[0], len);
+    srslte_vec_sc_prod_cfc(signal_buffer, scale, signal_buffer, len);
     log_h->console("PRACH: Pathloss=%.2f dB, Target power %.2f dBm, TX_power %.2f dBm, TX_gain %.1f dB\n",
           pathloss, target_power_dbm, tx_power, radio_handler->get_tx_gain(), scale);
     
@@ -210,7 +208,8 @@ void prach::send(srslte::radio *radio_handler, float cfo, float pathloss, srslte
     Debug("TX PRACH: Power control for PRACH is disabled, setting gain to %.0f dB\n", prach_gain);
   }
 
-  radio_handler->tx((void **) signal_buffer, len, tx_time);
+  void *tmp_buffer[SRSLTE_MAX_PORTS] = {signal_buffer, NULL, NULL, NULL};
+  radio_handler->tx(tmp_buffer, len, tx_time);
   radio_handler->tx_end();
   
   Info("PRACH: Transmitted preamble=%d, CFO=%.2f KHz, tx_time=%f\n",