diff --git a/core/base/CbmDaq.cxx b/core/base/CbmDaq.cxx
index d6a3198bfa967685aa17bec3d5b5c2fbe389a3ce..be7cd8f21d90244df9c840da00f5a52e8892b48f 100644
--- a/core/base/CbmDaq.cxx
+++ b/core/base/CbmDaq.cxx
@@ -187,7 +187,7 @@ void CbmDaq::Exec(Option_t*)
 
   // Event info
   Int_t file         = FairRunAna::Instance()->GetEventHeader()->GetInputFileId();
-  Int_t event        = FairRootManager::Instance()->GetEntryNr();
+  Int_t event        = FairRunAna::Instance()->GetEventHeader()->GetMCEntryNumber();
   Double_t eventTime = FairRunAna::Instance()->GetEventHeader()->GetEventTime();
   fEventList.Insert(event, file, eventTime);
 
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index 0fcd03721a904febb153ad70e7b1c9eb2a0674ec..bfacfd6ff2de219112153d7e333c137777ea91a8 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -154,7 +154,7 @@ foreach(setup IN LISTS cbm_setup)
   # --- Detector response simulation, time-based, using run_digi.C
   set(testname run_${sname}_digi_ts)
   set(eventrate 1.e7)
-  set(beamrate 1.e9)
+  set(beamrate 1.e7)
   set(tslength 1.e6)
   add_test(${testname} ${MACRO_DIR}/run_digi.sh
   	\"data/${sname}_coll\" -1 \"data/${sname}_ts\"\ ${eventrate} ${tslength}
diff --git a/macro/run/config.json b/macro/run/config.json
index 67b33835202c66b6d621d5d707b3b572a8457bff..b81fc8d4bcfbdc497bb03c5e9df8e1bed84ffa40 100644
--- a/macro/run/config.json
+++ b/macro/run/config.json
@@ -100,7 +100,7 @@
       {"id": -1,
        "path": "test_beam",
        "rate": "1.e9",
-       "treeAccessMode": "random"}
+       "treeAccessMode": "regular"}
     ],
     "output": {
       "path": "data/test_json",
diff --git a/macro/run/run_digi.C b/macro/run/run_digi.C
index 4e3f82f4816ece25799b8b9f8ed0ee71ca341961..bede1dc98dffa798b0492370d5bda0c005268f5b 100644
--- a/macro/run/run_digi.C
+++ b/macro/run/run_digi.C
@@ -132,7 +132,7 @@ void run_digi(TString inputEvents = "", Int_t nEvents = -1, TString output = "",
   run.AddInput(0, evntFile, eventRate);
   if (!eventMode) {
     if (!inputSignal.IsNull()) run.EmbedInput(1, signFile, 0);
-    if (!inputBeam.IsNull()) run.AddInput(2, beamFile, beamRate, ECbmTreeAccess::kRandom);
+    if (!inputBeam.IsNull()) run.AddInput(2, beamFile, beamRate);
   }
   run.SetOutputFile(outFile, overwrite);
   run.SetMonitorFile(moniFile);
diff --git a/sim/response/base/CbmDigitization.cxx b/sim/response/base/CbmDigitization.cxx
index 0f89d0fad2e44c1f73a4c827c90ce2f1489c1c21..5ed24c626ee793f9483d2882fe2771bb92861344 100644
--- a/sim/response/base/CbmDigitization.cxx
+++ b/sim/response/base/CbmDigitization.cxx
@@ -77,6 +77,8 @@ CbmDigitization::~CbmDigitization()
 void CbmDigitization::AddInput(UInt_t inputId, TString fileName, Double_t eventRate, ECbmTreeAccess mode)
 {
   if (gSystem->AccessPathName(fileName)) LOG(fatal) << fName << ": input file " << fileName << " does not exist!";
+  if (mode != ECbmTreeAccess::kRegular)
+    LOG(fatal) << fName << ": access modes other than kRegular are not yet supported!";
   TChain* chain = new TChain("cbmsim");
   chain->Add(fileName.Data());
   fSource->AddInput(inputId, chain, eventRate, mode);