diff --git a/src/dmr_bs.c b/src/dmr_bs.c
index 5387a5e..af0bf29 100644
--- a/src/dmr_bs.c
+++ b/src/dmr_bs.c
@@ -724,7 +724,7 @@ void dmrBSBootstrap (dsd_opts * opts, dsd_state * state)
   processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
 
   //collect the mi fragment
-  dmr_late_entry_mi_fragment (opts, state, 1, ambe_fr, ambe_fr2, ambe_fr3);
+  dmr_late_entry_mi_fragment (opts, state, 1, m1, m2, m3);
 
   cach_err = dmr_cach (opts, state, cachdata);
   fprintf (stderr, "\n");
diff --git a/src/dmr_data.c b/src/dmr_data.c
index d4b16ff..b8904cb 100644
--- a/src/dmr_data.c
+++ b/src/dmr_data.c
@@ -304,7 +304,7 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
   if (state->dmr_ms_rc == 0) dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);
 
   //don't run cach on simplex or mono
-  if (state->dmr_ms_mode == 0 || opts->dmr_mono == 0)
+  if (state->dmr_ms_mode == 0 && opts->dmr_mono == 0)
   {
     cach_err = dmr_cach (opts, state, cachdata);
   } 
diff --git a/src/dmr_ms.c b/src/dmr_ms.c
index 435095f..14b79ef 100644
--- a/src/dmr_ms.c
+++ b/src/dmr_ms.c
@@ -587,7 +587,7 @@ void dmrMSBootstrap (dsd_opts * opts, dsd_state * state)
   }
 
   //collect the mi fragment
-  dmr_late_entry_mi_fragment (opts, state, 1, ambe_fr, ambe_fr2, ambe_fr3);
+  dmr_late_entry_mi_fragment (opts, state, 1, m1, m2, m3);
 
   //errors due to skipping other slot
   // cach_err = dmr_cach (opts, state, cachdata);