diff --git a/core/data/CbmMatch.h b/core/data/CbmMatch.h
index 9c4336cc387f3309c1a133dc729ce59fa0164fa7..6690700f39f953cfc3ed2489da42b8a322c38538 100644
--- a/core/data/CbmMatch.h
+++ b/core/data/CbmMatch.h
@@ -36,9 +36,9 @@ public:
   virtual ~CbmMatch();
 
   /* Accessors */
-  const CbmLink& GetLink(int32_t i) const { return fLinks[i]; }
+  const CbmLink& GetLink(int32_t i) const { return fLinks.at(i); }
   const std::vector<CbmLink>& GetLinks() const { return fLinks; }
-  const CbmLink& GetMatchedLink() const { return fLinks[fMatchedIndex]; }
+  const CbmLink& GetMatchedLink() const { return fLinks.at(fMatchedIndex); }
   int32_t GetNofLinks() const { return fLinks.size(); }
   double GetTotalWeight() const { return fTotalWeight; }