diff --git a/core/detectors/tof/CbmTofTrackingInterface.h b/core/detectors/tof/CbmTofTrackingInterface.h
index 515bed959ab850d2bafbc85c72db6f87cfe13db7..68a8f8a5eb65ea68b6b0914fc7160d0bcd1f7769 100644
--- a/core/detectors/tof/CbmTofTrackingInterface.h
+++ b/core/detectors/tof/CbmTofTrackingInterface.h
@@ -127,14 +127,16 @@ public:
   }
 
   /// Gets max z of the station
+  /// FIXME: Replace GetZref(stationId) + 5 with fTofStationZMax[stationId] + 0.5
   /// \param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// \return max Z of the station [cm]
-  double GetZmax(int stationId) const { return fTofStationZMax[stationId] + 0.5; }
+  double GetZmax(int stationId) const { return GetZref(stationId) + 5.; }
 
+  /// FIXME: Replace GetZref(stationId) - 5 with fTofStationZMin[stationId] - 0.5
   /// @brief  Gets min z of the station
   /// @param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])
   /// @return min Z of the station [cm]
-  double GetZmin(int stationId) const { return fTofStationZMin[stationId] - 0.5; }
+  double GetZmin(int stationId) const { return GetZref(stationId) - 5.; }
 
   /// @brief  Check if station provides time measurements
   /// @param  stationId  Tracking station ID in the setup (NOTE: must be in range [0..GetNstations()-1])