diff --git a/setup/setup_mcbm_beam_2022_05_23_nickel.C b/setup/setup_mcbm_beam_2022_05_23_nickel.C
index c1fd0787af98375da1e8f30ac931932226639e9a..2dc29d3e08062e84bf75ac8056cb045d7f4be33a 100644
--- a/setup/setup_mcbm_beam_2022_05_23_nickel.C
+++ b/setup/setup_mcbm_beam_2022_05_23_nickel.C
@@ -8,6 +8,7 @@
 
 // clang-format off
 
+// 2022-09-13 - EC - removes buggy tof geometry, replaces
 // 2022-09-13 - DE - correct sensor overlap in y for STS ladder type 10
 // 2022-05-24 - DE - prepare setup for mCBM May 2022-05-23 nickel run
 // 2022-05-24 - DE - disable PSD to reduce secondaries (PSD is in parking position)
@@ -75,7 +76,7 @@ void setup_mcbm_beam_2022_05_23_nickel() {
   TString trdGeoTag  = "v22h_mcbm"; // TRD-2D May 2022 + 2x TRD-1D modules
 
   // done
-  TString tofGeoTag  = "v21h_mcbm"; // same calibration parameters as v21g
+  TString tofGeoTag  = "v21i_mcbm"; // same calibration parameters as v21g
 
   // done
   TString richGeoTag = "v21c_mcbm"; // othogonal to z-axis
diff --git a/setup/setup_mcbm_beam_2022_06_16_gold.C b/setup/setup_mcbm_beam_2022_06_16_gold.C
index dc1cf91eb20baa17ff4dc2fe2b0bfeb80eae776f..6eed03ce6f697822879c6a660a0fa8d92073dc6c 100644
--- a/setup/setup_mcbm_beam_2022_06_16_gold.C
+++ b/setup/setup_mcbm_beam_2022_06_16_gold.C
@@ -8,6 +8,7 @@
 
 // clang-format off
 
+// 2022-11-23 - EC - remove buggy tof geo, replaced it
 // 2022-09-13 - DE - correct sensor overlap in y for STS ladder type 10
 // 2022-05-24 - DE - prepare setup for mCBM May 2022-05-23 nickel run
 // 2022-05-24 - DE - disable PSD to reduce secondaries (PSD is in parking position)
@@ -75,7 +76,7 @@ void setup_mcbm_beam_2022_06_16_gold() {
   TString trdGeoTag  = "v22h_mcbm"; // TRD-2D May 2022 + 2x TRD-1D modules
 
   // done
-  TString tofGeoTag  = "v21h_mcbm"; // same calibration parameters as v21g
+  TString tofGeoTag  = "v21i_mcbm"; // same calibration parameters as v21g
 
   // done
   TString richGeoTag = "v21c_mcbm"; // othogonal to z-axis
diff --git a/setup/setup_mcbm_beam_2022_08.C b/setup/setup_mcbm_beam_2022_08.C
index 4bfea2dbeb9be52948f376091d0591c8120b4fac..9616c8a66f312d671146f8100de7788c757aee19 100644
--- a/setup/setup_mcbm_beam_2022_08.C
+++ b/setup/setup_mcbm_beam_2022_08.C
@@ -8,6 +8,7 @@
 
 // clang-format off
 
+// 2022-11-22 - EC - remove buggy tof, replaced it.
 // 2022-05-07 - DE - derived from setup 2022_04 - use mTOF v21h
 // 2022-02-22 - QZ - use mTOF v22a for setup 2022
 // 2021-10-03 - SR - setup for 2022 beamtime for the study of lambda physics
@@ -62,7 +63,7 @@ void setup_mcbm_beam_2022_08() {
   TString stsGeoTag     = "v20e_mcbm";
   // TString muchGeoTag     = "v22c_mcbm"; // 2 layers
   TString trdGeoTag     = "v22a_mcbm"; // 2022
-  TString tofGeoTag     = "v21h_mcbm"; // TOF
+  TString tofGeoTag     = "v21i_mcbm"; // TOF
   TString richGeoTag    = "v20d_mcbm"; // geometry provided by RICH group
   TString psdGeoTag     = "v20a_mcbm"; // at 25 degree, below the beampipe
   // ------------------------------------------------------------------------
diff --git a/tof/tof_v21h_mcbm.geo.info b/tof/tof_v21h_mcbm.geo.info
index 039bf453d2c141e133994c12edca24127183bfd9..95be9aeb024b18fa14268d77590bdfd72d4cb09e 100644
--- a/tof/tof_v21h_mcbm.geo.info
+++ b/tof/tof_v21h_mcbm.geo.info
@@ -1,4 +1,10 @@
-#
+The binary tof_v21h used in some mCBM simulation and data analysis had errors
+due to a change in dimensional system used and its dimension handling by root
+which lead to radlen and intlen being 10 times greater than reality.
+
+The geometry was removed and replaced with tof_v21i which is an indentical 
+geometry without this error.
+
 ##   tof_v21h_mcbm information file
 #
 
diff --git a/tof/tof_v21h_mcbm.geo.root b/tof/tof_v21h_mcbm.geo.root
deleted file mode 100644
index 39bc35213febffdb2c4370a82a199c15ef6e9bb7..0000000000000000000000000000000000000000
Binary files a/tof/tof_v21h_mcbm.geo.root and /dev/null differ
diff --git a/tof/tof_v21i_mcbm.geo.info b/tof/tof_v21i_mcbm.geo.info
new file mode 100644
index 0000000000000000000000000000000000000000..11886086c4c43719d348165562094a3cce9b9037
--- /dev/null
+++ b/tof/tof_v21i_mcbm.geo.info
@@ -0,0 +1,15 @@
+#
+##   tof_v21i_mcbm information file
+#
+
+# created 20221122
+
+# TOF setup
+
+# envelope
+   0.00 cm   start of TOF (z)
+ 416.50 cm   end   of TOF (z)
+
+# central tower position
+ 400.00 cm   center of staggered, front RPC cell at x=0
+
diff --git a/tof/tof_v21i_mcbm.geo.root b/tof/tof_v21i_mcbm.geo.root
new file mode 100644
index 0000000000000000000000000000000000000000..8ea148cb9154273ef199ad1bacaf66f20f20a6d7
Binary files /dev/null and b/tof/tof_v21i_mcbm.geo.root differ