diff --git a/.last_sync_id b/.last_sync_id
index f2f0032..78a90e1 100644
--- a/.last_sync_id
+++ b/.last_sync_id
@@ -1 +1 @@
-e0e85789c097b7f829a9b7e9354ab32f207c298a
+4ba8f23f982e590b7217e095645de7d32c62922e
diff --git a/klicky-macros.cfg b/klicky-macros.cfg
index eb56f20..8a38100 100644
--- a/klicky-macros.cfg
+++ b/klicky-macros.cfg
@@ -761,7 +761,7 @@ gcode:
         {% endif %}
 
         # if probe is configured as endstop, attach it, else check if the probe needs to be docked if attached
-        {% if printer['configfile'].config["stepper_z"]["endstop_pin"] == 'probe:z_virtual_endstop' %}
+        {% if 'z_virtual_endstop' in printer['configfile'].config["stepper_z"]["endstop_pin"] %}
             _KlickyDebug msg="homing_override probe configured as a virtual Z endstop attaching probe"
             Attach_Probe
             # if PROBE_LOCK parameter is given, Attach Probe and lock until it´s unlocked
@@ -775,7 +775,7 @@ gcode:
         _Home_Z
 
         # if probe is configured as endstop, dock it
-        {% if printer['configfile'].config["stepper_z"]["endstop_pin"] == 'probe:z_virtual_endstop' %}
+        {% if 'z_virtual_endstop' in printer['configfile'].config["stepper_z"]["endstop_pin"] %}
             _KlickyDebug msg="homing_override probe no longer required, docking probe"
             Dock_Probe
         {% elif dock_on_zhome == False %}