diff --git a/algo/detectors/tof/Hitfind.cxx b/algo/detectors/tof/Hitfind.cxx
index d02d56cbae1ed8df000e32a900fa1994f6648819..2d74178106d92f6036e5b3f5d80dec4e61fc02e1 100644
--- a/algo/detectors/tof/Hitfind.cxx
+++ b/algo/detectors/tof/Hitfind.cxx
@@ -184,8 +184,8 @@ namespace cbm::algo::tof
         continue;
       }
 
-      HitfindSetup::Rpc rpcPar      = fTofConfig.rpcs.at(SmType).at(Sm * NbRpc + Rpc);
-      HitfindSetup::Channel chanPar = rpcPar.chanPar[Chan];
+      HitfindSetup::Rpc& rpcPar      = fTofConfig.rpcs.at(SmType).at(Sm * NbRpc + Rpc);
+      HitfindSetup::Channel& chanPar = rpcPar.chanPar[Chan];
 
       if (rpcPar.swapChannelSides && 5 != SmType && 8 != SmType) {
         pDigi.SetAddress(Sm, Rpc, Chan, (0 == Side) ? 1 : 0, SmType);