diff --git a/core/data/mvd/CbmMvdCluster.h b/core/data/mvd/CbmMvdCluster.h
index 1498fce913614fad4e1218477dc602c4ba02ff1b..b76c734eb6c4bda08f8996a60d8742cf6b0d711c 100644
--- a/core/data/mvd/CbmMvdCluster.h
+++ b/core/data/mvd/CbmMvdCluster.h
@@ -50,7 +50,7 @@ public:
   int32_t GetStationNr() { return (int32_t) GetAddress() / 1000; };
   int32_t GetRefId() { return fRefId; };
   int32_t GetDetectorId() { return DetectorId(GetStationNr()); };
-  int32_t GetSensorNr() { return GetAddress() - (((int32_t) GetAddress() / 1000) * 1000); };
+  int32_t GetSensorNr() { return (GetAddress() % 1000); };
 
   float GetClusterCharge() { return fClusterCharge; };