diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
index b4e5f269862..5720d31873d 100644
--- a/addons/common/XEH_PREP.hpp
+++ b/addons/common/XEH_PREP.hpp
@@ -37,6 +37,7 @@ PREP(displayTextPicture);
 PREP(displayTextStructured);
 PREP(doAnimation);
 PREP(doGesture);
+PREP(dummy);
 PREP(dropBackpack);
 PREP(endRadioTransmission);
 PREP(eraseCache);
diff --git a/addons/common/functions/fnc_dummy.sqf b/addons/common/functions/fnc_dummy.sqf
new file mode 100644
index 00000000000..a70fed35c00
--- /dev/null
+++ b/addons/common/functions/fnc_dummy.sqf
@@ -0,0 +1,12 @@
+/*
+ * Author: SilentSpike
+ * A dummy function which does nothing. Can be useful.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
diff --git a/addons/zeus/CfgVehicles.hpp b/addons/zeus/CfgVehicles.hpp
index 42dc6d42890..0965166db44 100644
--- a/addons/zeus/CfgVehicles.hpp
+++ b/addons/zeus/CfgVehicles.hpp
@@ -86,6 +86,7 @@ class CfgVehicles {
     class GVAR(moduleBase): Module_F {
         author = ECSTRING(common,ACETeam);
         category = "ACE";
+        function = QEFUNC(common,dummy);
         functionPriority = 1;
         isGlobal = 1;
         isTriggerActivated = 0;
diff --git a/addons/zeus/XEH_postInit.sqf b/addons/zeus/XEH_postInit.sqf
index 0c3ff85cdf8..adf3d75a9bf 100644
--- a/addons/zeus/XEH_postInit.sqf
+++ b/addons/zeus/XEH_postInit.sqf
@@ -10,6 +10,7 @@
 // Global skill module PVs values for persistence, just listen for the PV
 QGVAR(GlobalSkillAI) addPublicVariableEventHandler FUNC(moduleGlobalSetSkill);
 
+[QGVAR(moveToRespawnPosition), BIS_fnc_moveToRespawnPosition] call CBA_fnc_addEventHandler;
 [QGVAR(moduleDefendArea), CBA_fnc_taskDefend] call CBA_fnc_addEventHandler;
 [QGVAR(modulePatrolArea), CBA_fnc_taskPatrol] call CBA_fnc_addEventHandler;
 [QGVAR(moduleSearchNearby), CBA_fnc_searchNearby] call CBA_fnc_addEventHandler;
diff --git a/addons/zeus/functions/fnc_moduleTeleportPlayers.sqf b/addons/zeus/functions/fnc_moduleTeleportPlayers.sqf
index 4a1855ba65f..c52517a7d0a 100644
--- a/addons/zeus/functions/fnc_moduleTeleportPlayers.sqf
+++ b/addons/zeus/functions/fnc_moduleTeleportPlayers.sqf
@@ -36,9 +36,10 @@ if (_group) then {
 
     private _attached = attachedTo _logic;
     if (isNull _attached) then {
-        [_x, _logic] call BIS_fnc_moveToRespawnPosition;
+        // Function takes position AGL and must be ran where local
+        [QGVAR(moveToRespawnPosition), [_x, _logic modelToWorld [0,0,0]], _x] call CBA_fnc_targetEvent;
     } else {
-        [_x, _attached] call BIS_fnc_moveToRespawnPosition;
+        [QGVAR(moveToRespawnPosition), [_x, _attached], _x] call CBA_fnc_targetEvent;
     };
 } forEach _player;