diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
index b55fd46e24fe37f76febb123ede2172929c3072f..314bc38086bd804d424e3ff62ee540be15290fd1 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingAlgo.cxx
@@ -140,6 +140,7 @@ void CbmMcbmCheckTimingAlgo::CreateHistos()
                                                 1800, 0, 18000,
                                                 (*det).uRangeNbBins, (*det).dTimeRangeBeg, (*det).dTimeRangeEnd )
                                     );
+    LOG( info ) << "Created histos for " << (*det).sName;
   } // for( std::vector< CheckTimingDetector >::iterator det = fvDets.begin(); det != fvDets.end(); ++det )
 
   /// Add reference detector digi to digi time difference histo at end of vector
@@ -275,7 +276,7 @@ void CbmMcbmCheckTimingAlgo::CheckInterSystemOffset()
     } // if( ECbmModuleId::kT0 == fRefDet.detId )
       else
       {
-        dRefTime   = fDigiMan->Get< DigiRef >( uDigi )->GetTime() ;
+        dRefTime   = fDigiMan->Get< DigiRef >( uDigi )->GetTime();
         dRefCharge = fDigiMan->Get< DigiRef >( uDigi )->GetCharge();
       } // else of if( ECbmModuleId::kT0 == fRefDet.detId )
 
@@ -361,7 +362,27 @@ void CbmMcbmCheckTimingAlgo::FillTimeOffsetHistos( const Double_t dRefTime,
                                                    const Double_t dRefCharge,
                                                    UInt_t uDetIdx )
 {
-  UInt_t uNbDigis = fDigiMan->GetNofDigis( fvDets[ uDetIdx ].detId );
+  UInt_t uNbDigis = 0;
+  switch( fvDets[ uDetIdx ].detId )
+  {
+    case ECbmModuleId::kNotExist:
+    {
+      LOG( fatal ) << "CbmMcbmCheckTimingAlgo::FillTimeOffsetHistos => Unknow detector enum! "
+                   << fRefDet.sName;
+      break;
+    } // Digi containers controlled by DigiManager
+    case ECbmModuleId::kT0:
+    {
+      uNbDigis = fpT0DigiVec->size();
+      break;
+    } // case ECbmModuleId::kT0
+    default:
+    {
+      uNbDigis = fDigiMan->GetNofDigis( fvDets[ uDetIdx ].detId );
+      break;
+    } // default:
+  } // switch( fRefDet.detId )
+
   UInt_t uFirstDigiInWin = fvDets[ uDetIdx ].iPrevRefFirstDigi;
 
   for( UInt_t uDigiIdx = fvDets[ uDetIdx ].iPrevRefFirstDigi; uDigiIdx < uNbDigis; ++uDigiIdx )
@@ -446,12 +467,14 @@ void CbmMcbmCheckTimingAlgo::WriteHistos()
 
   for( UInt_t uDetIdx = 0; uDetIdx < fvDets.size(); ++uDetIdx )
   {
+    LOG( info ) << "Saving histos for " << fvDets[ uDetIdx ].sName;
     fvhDetSelfDiff[ uDetIdx ]->Write();
     fvhDetToRefDiff[ uDetIdx ]->Write();
     fvhDetToRefDiffRefCharge[ uDetIdx ]->Write();
     fvhDetToRefDiffDetCharge[ uDetIdx ]->Write();
     fvhDetToRefDiffEvo[ uDetIdx ]->Write();
     fvhDetToRefDiffEvoLong[ uDetIdx ]->Write();
+    LOG( info ) << "Saved histos for " << fvDets[ uDetIdx ].sName;
   } // for( std::vector< CheckTimingDetector >::iterator det = fvDets.begin(); det != fvDets.end(); ++det )
 
   /// Register the histo for reference detector digi to digi time difference
diff --git a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
index f3f4b12caa7f263250fa6993504a0326e636f818..a0e6adae3fe6d2d0b6c2e5da9c875a65e8be5c81 100644
--- a/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
+++ b/fles/mcbm2018/tasks/CbmMcbmCheckTimingTask.cxx
@@ -69,7 +69,7 @@ void CbmMcbmCheckTimingTask::Exec(Option_t* /*option*/)
 // ---- Finish --------------------------------------------------------
 void CbmMcbmCheckTimingTask::Finish()
 {
-//  SaveHistos();
+  SaveHistos();
 
   /// Call Algo finish method
   fpAlgo->Finish();