diff --git a/MPCNC.cps b/MPCNC.cps
index 2c898fb..cad8b67 100644
--- a/MPCNC.cps
+++ b/MPCNC.cps
@@ -1745,7 +1745,7 @@ function toolChange() {
     flushMotions();
 
     // Go to tool change position
-    onRapid(propertyMmToUnit(properties.toolChange1_X), propertyMmToUnit(properties.toolChange2_Y), propertyMmToUnit(properties.toolChangeZ));
+    onRapid(propertyMmToUnit(properties.toolChange1_X), propertyMmToUnit(properties.toolChange2_Y), propertyMmToUnit(properties.toolChange3_Z));
     
     flushMotions();