diff --git a/MQ/source/CbmMQTsaMultiSamplerTof.cxx b/MQ/source/CbmMQTsaMultiSamplerTof.cxx
index bcefa65be16bb87dd2c294c6792a6bbde8f38574..4a42a9dea00550e3f827b134d07b039bf3f6c8d1 100644
--- a/MQ/source/CbmMQTsaMultiSamplerTof.cxx
+++ b/MQ/source/CbmMQTsaMultiSamplerTof.cxx
@@ -290,7 +290,7 @@ bool CbmMQTsaMultiSamplerTof::ConditionalRun()
               if (fComponentsToSend[idx] > 0) {
                 LOG(debug) << "Append timeslice component of link " << nrComp << " to idx " << idx;
 
-                fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp), ts.index())};
+                fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_core_microslices()), ts.index()};
                 component.append_component(ts.num_microslices(0));
 
                 for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
@@ -365,7 +365,7 @@ bool CbmMQTsaMultiSamplerTof::CreateAndCombineComponents(const fles::Timeslice&
     if (fComponentsToSend[idx]>0) {
       LOG(debug) << "Append timeslice component of link " << nrComp<< " to idx "<<idx;
 
-      fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_microslices(nrComp), ts.index())};
+      fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_core_microslices()), ts.index()};
       component.append_component(ts.num_microslices(0));
 
       for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
@@ -406,7 +406,7 @@ bool CbmMQTsaMultiSamplerTof::AppendData(const fles::StorableTimeslice& /*compon
 bool CbmMQTsaMultiSamplerTof::SendTs()
 {
   /*
-  for (int idx=0; idx<parts.size(); idx++)   
+  for (int idx=0; idx<parts.size(); idx++)
     if(bparts[idx]){
       LOG(debug) << "Send data to channel " << fChannelsToSend[idx][0];
       if (Send(parts[idx], fChannelsToSend[idx][0]) < 0) {
@@ -525,7 +525,7 @@ bool CbmMQTsaMultiSamplerTof::CheckTimeslice(const fles::Timeslice& ts)
     LOG(debug) << "Component " << c << " has the system id 0x" << std::hex
                << static_cast<int>(ts.descriptor(c, 0).sys_id) << std::dec;
     /*
-    if(ts.descriptor(c,0).sys_id == 0x90 ) { // found a t0 - timeslice 
+    if(ts.descriptor(c,0).sys_id == 0x90 ) { // found a t0 - timeslice
            ts.descriptor(c,0).sys_id = 0x60;         // rename t0 to tof , not allowed
     }
     */
diff --git a/MQ/source/CbmMQTsaSampler.cxx b/MQ/source/CbmMQTsaSampler.cxx
index cff74002b6f8b8027634199effb3f1be117a4f28..f129557d5f2a635f9ceaa481047ceb9c48044068 100644
--- a/MQ/source/CbmMQTsaSampler.cxx
+++ b/MQ/source/CbmMQTsaSampler.cxx
@@ -305,7 +305,7 @@ bool CbmMQTsaSampler::CreateAndSendComponent(const fles::Timeslice& ts, int nrCo
     if (fComponentsToSend[idx] > 0) {
       LOG(info) << "Create timeslice component for link " << nrComp;
 
-      fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp)), ts.index()};
+      fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_core_microslices()), ts.index()};
       component.append_component(ts.num_microslices(0));
 
       for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
diff --git a/MQ/source/CbmMQTsaSamplerTof.cxx b/MQ/source/CbmMQTsaSamplerTof.cxx
index c9deed042f92a229614c167f198aaa31755e21d3..74af486b71c129697f795d539e765267ccca71eb 100644
--- a/MQ/source/CbmMQTsaSamplerTof.cxx
+++ b/MQ/source/CbmMQTsaSamplerTof.cxx
@@ -306,7 +306,7 @@ bool CbmMQTsaSamplerTof::ConditionalRun()
           if (fComponentsToSend[idx] > 0) {
             LOG(debug) << "Append timeslice component of link " << nrComp << " to idx " << idx;
 
-            fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp)), ts.index()};
+            fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_core_microslices()), ts.index()};
             component.append_component(ts.num_microslices(0));
 
             for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
@@ -390,7 +390,7 @@ bool CbmMQTsaSamplerTof::CreateAndCombineComponents(const fles::Timeslice& /*ts*
     if (fComponentsToSend[idx]>0) {
       LOG(debug) << "Append timeslice component of link " << nrComp<< " to idx "<<idx;
 
-      fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_microslices(nrComp), ts.index())};
+      fles::StorableTimeslice component{static_cast<uint32_t>(ts.num_core_microslices()), ts.index()};
       component.append_component(ts.num_microslices(0));
 
       for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {
@@ -431,7 +431,7 @@ bool CbmMQTsaSamplerTof::AppendData(const fles::StorableTimeslice& /*component*/
 bool CbmMQTsaSamplerTof::SendTs()
 {
   /*
-  for (int idx=0; idx<parts.size(); idx++)   
+  for (int idx=0; idx<parts.size(); idx++)
     if(bparts[idx]){
       LOG(debug) << "Send data to channel " << fChannelsToSend[idx][0];
       if (Send(parts[idx], fChannelsToSend[idx][0]) < 0) {
@@ -462,7 +462,7 @@ bool CbmMQTsaSamplerTof::CreateAndSendComponent(const fles::Timeslice& ts, int n
     if (fComponentsToSend[idx] > 0) {
       LOG(debug) << "Create timeslice component for link " << nrComp;
 
-      fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_microslices(nrComp)), ts.index()};
+      fles::StorableTimeslice component {static_cast<uint32_t>(ts.num_core_microslices()), ts.index()};
       component.append_component(ts.num_microslices(0));
 
       for (size_t m = 0; m < ts.num_microslices(nrComp); ++m) {