diff --git a/reco/detectors/tof/CbmTofCalibrator.cxx b/reco/detectors/tof/CbmTofCalibrator.cxx
index c94b581016ee121cfda3633c3679943da0b03d7d..0e775a26a5df6c8db5b3d43cc44645e7051c63c6 100644
--- a/reco/detectors/tof/CbmTofCalibrator.cxx
+++ b/reco/detectors/tof/CbmTofCalibrator.cxx
@@ -228,7 +228,7 @@ Bool_t CbmTofCalibrator::CreateCalHist() {
 void CbmTofCalibrator::FillCalHist(CbmTofTracklet* pTrk) {
   // fill deviation histograms on walk level
   if (pTrk->GetTt() < 0) return;  // take tracks with positive velocity only
-  if (!pTrk->ContainsAddr(0x00005006))
+  if (!pTrk->ContainsAddr(CbmTofAddress::GetUniqueAddress(0, 0, 0, 0, 5)))
     return;  // request beam counter hit for calibration
   if (fdR0Lim
       > 0.)  // consider only tracks originating from nominal interaction point