diff --git a/macros.d/start_end.cfg b/macros.d/start_end.cfg
index b4a677d..fdda36a 100644
--- a/macros.d/start_end.cfg
+++ b/macros.d/start_end.cfg
@@ -12,7 +12,6 @@ gcode:
     ##### Get Boundaries #####
     {% set max_x = printer.toolhead.axis_maximum.x|float %}
     {% set max_y = printer.toolhead.axis_maximum.y|float %}
-    {% set max_z = printer.toolhead.axis_maximum.z|float %}
     {% set mid_x = max_x / 2 %}
     {% set mid_y = max_y / 2 %}
 
@@ -65,7 +64,7 @@ gcode:
     ##### Get Boundaries #####
     {% set max_y = printer.toolhead.axis_maximum.y|float %}
     {% set max_z = printer.toolhead.axis_maximum.z|float %}
-    {% set mid_x = (printer.toolhead.axis_maximum.z|float / 2)|float %}
+    {% set mid_x = (printer.toolhead.axis_maximum.x|float / 2)|float %}
 
     SAVE_GCODE_STATE NAME=STATE_PRINT_END
     M400                ; Wait for buffer to clear
@@ -82,7 +81,7 @@ gcode:
     TURN_OFF_HEATERS
     M107
     G90
-    G0 X60 Y{max_y} F20000
+    G0 X{mid_x} Y{max_y} F20000
     G0 Z{max_z} F6000
 
     BED_MESH_CLEAR