diff --git a/lib/src/phy/ch_estimation/chest_dl.c b/lib/src/phy/ch_estimation/chest_dl.c
index 1deb53489..b7324a137 100644
--- a/lib/src/phy/ch_estimation/chest_dl.c
+++ b/lib/src/phy/ch_estimation/chest_dl.c
@@ -390,7 +390,7 @@ static void interpolate_pilots(srslte_chest_dl_t *q, cf_t *pilot_estimates, cf_t
         fidx_offset = srslte_refsignal_mbsfn_fidx(l - 1);
         srslte_interp_linear_offset(&q->srslte_interp_lin_mbsfn, &pilot_estimates[(2*q->cell.nof_prb) + 6*q->cell.nof_prb*(l - 1)],
                                     &ce[srslte_refsignal_mbsfn_nsymbol(l - 1) * q->cell.nof_prb * SRSLTE_NRE],
-                                    fidx_offset, (fidx_offset)?0:1);
+                                    fidx_offset, SRSLTE_NRE/6-fidx_offset);
         
       }
     } else {
diff --git a/lib/src/phy/ue/ue_dl.c b/lib/src/phy/ue/ue_dl.c
index 8571825bf..8e9353236 100644
--- a/lib/src/phy/ue/ue_dl.c
+++ b/lib/src/phy/ue/ue_dl.c
@@ -674,7 +674,7 @@ int srslte_ue_dl_decode_mbsfn(srslte_ue_dl_t * q,
   if (ret == SRSLTE_SUCCESS) {
     return q->pmch_cfg.grant.mcs[0].tbs;
   } else {
-    return 0;
+    return ret;
   }
 }