diff --git a/srslte/lib/phch/pdsch.c b/srslte/lib/phch/pdsch.c
index 02f85c5d3..ccaea5282 100644
--- a/srslte/lib/phch/pdsch.c
+++ b/srslte/lib/phch/pdsch.c
@@ -444,7 +444,7 @@ int srslte_pdsch_decode_multi(srslte_pdsch_t *q,
       /* no need for layer demapping */
       srslte_predecoding_single_multi(q->symbols, q->ce[0], q->d, q->nof_rx_antennas, cfg->nbits.nof_re, noise_estimate);
     } else {
-      srslte_predecoding_diversity_multi(q->symbols, q->ce, x, q->cell.nof_ports, q->nof_rx_antennas, cfg->nbits.nof_re);
+      srslte_predecoding_diversity_multi(q->symbols, q->ce, x, q->nof_rx_antennas, q->cell.nof_ports, cfg->nbits.nof_re);
       srslte_layerdemap_diversity(x, q->d, q->cell.nof_ports, cfg->nbits.nof_re / q->cell.nof_ports);
     }
     
diff --git a/srslte/lib/phch/test/pdsch_test_mex.c b/srslte/lib/phch/test/pdsch_test_mex.c
index 869a4829c..fa455809b 100644
--- a/srslte/lib/phch/test/pdsch_test_mex.c
+++ b/srslte/lib/phch/test/pdsch_test_mex.c
@@ -245,7 +245,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
       cf_t *cearray = NULL; 
       mexutils_read_cf(prhs[NOF_INPUTS], &cearray);
       cf_t *cearray_ptr = cearray; 
-      for (int k=0;k<SRSLTE_MAX_RXANT;k++) {
+      for (int k=0;k<nof_antennas;k++) {
         for (i=0;i<cell.nof_ports;i++) {
           for (int j=0;j<SRSLTE_SF_LEN_RE(cell.nof_prb, cell.cp);j++) {
             ce[i][k][j] = *cearray_ptr;
@@ -293,8 +293,8 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
     uint32_t len = nof_antennas*cell.nof_ports*SRSLTE_SF_LEN_RE(cell.nof_prb, cell.cp);
     cf_t *cearray_ptr = srslte_vec_malloc(len*sizeof(cf_t)); 
     int n=0;
-    for (int k=0;k<nof_antennas;k++) {
-      for (i=0;i<cell.nof_ports;i++) {
+    for (i=0;i<cell.nof_ports;i++) {
+      for (int k=0;k<nof_antennas;k++) {
         for (int j=0;j<SRSLTE_SF_LEN_RE(cell.nof_prb, cell.cp);j++) {
           cearray_ptr[n] = ce[i][k][j];
           n++;