Fixed True CPS tracking for large numbers