diff --git a/core/detectors/tof/CbmTofCreateDigiPar.cxx b/core/detectors/tof/CbmTofCreateDigiPar.cxx
index 0c647f195b5a37ea6b4bd793dfe83a1d4dd30eb0..983b5796febddc0bcb96cb12a65161f2e6b7f652 100644
--- a/core/detectors/tof/CbmTofCreateDigiPar.cxx
+++ b/core/detectors/tof/CbmTofCreateDigiPar.cxx
@@ -74,8 +74,9 @@ void CbmTofCreateDigiPar::SetParContainers() {
   LOG(info) << " * CbmTofCreateDigiPar:: SetParContainers() ";
 
   // Get Base Container
-  FairRunAna* ana     = FairRunAna::Instance();
-  FairRuntimeDb* rtdb = ana->GetRuntimeDb();
+  //FairRunAna* ana     = FairRunAna::Instance();
+  //FairRuntimeDb* rtdb = ana->GetRuntimeDb();
+  FairRuntimeDb* rtdb = FairRuntimeDb::instance();
 
   fDigiPar = (CbmTofDigiPar*) (rtdb->getContainer("CbmTofDigiPar"));
 
@@ -89,8 +90,9 @@ InitStatus CbmTofCreateDigiPar::ReInit() {
   LOG(info) << " * CbmTofCreateDigiPar * :: ReInit() ";
 
   // Get Base Container
-  FairRunAna* ana     = FairRunAna::Instance();
-  FairRuntimeDb* rtdb = ana->GetRuntimeDb();
+  //FairRunAna* ana     = FairRunAna::Instance();
+  //FairRuntimeDb* rtdb = ana->GetRuntimeDb();
+  FairRuntimeDb* rtdb = FairRuntimeDb::instance();
 
   fDigiPar = (CbmTofDigiPar*) (rtdb->getContainer("CbmTofDigiPar"));