diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo
index 02a6dac3..1530d89c 100644
Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo differ
diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
index 8a037299..cfc88037 100644
Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo differ
diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
index d7c2fed3..091d7c06 100644
Binary files a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo and b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo differ
diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp
index e042b4ae..cc789314 100644
--- a/Sources/epoch_server/build.hpp
+++ b/Sources/epoch_server/build.hpp
@@ -1 +1 @@
-build=708;
+build=709;
diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf
index a7b4a3a8..f810daf5 100644
--- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf
+++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_makeSP.sqf
@@ -23,7 +23,10 @@ if (_player distance _jammer > 20) exitWith{};
 if (alive _jammer) then {
     if ((_jammer getVariable["BUILD_OWNER", "-1"]) in [getPlayerUID _player, _player getVariable["GROUP", ""]]) then {
         _server_vars = _player getVariable["SERVER_VARS", []];
-        if (_server_vars param [0,[]] isEqualTo []) then {
+        _currentPos = _server_vars param [0,[]];
+        // invalidate previous position
+        if (_jammer distance _currentPos > 20) then { _currentPos = [] };
+        if (_currentPos isEqualTo []) then {
             // set position of spawnpoint to players SERVER_VARS
             _server_vars set [0, getposATL _jammer]; // 0 = RESPAWN POS
             _player setVariable ["SERVER_VARS", _server_vars];
diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp
index e042b4ae..cc789314 100644
--- a/Sources/epoch_server_core/build.hpp
+++ b/Sources/epoch_server_core/build.hpp
@@ -1 +1 @@
-build=708;
+build=709;
diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp
index e042b4ae..cc789314 100644
--- a/Sources/epoch_server_settings/build.hpp
+++ b/Sources/epoch_server_settings/build.hpp
@@ -1 +1 @@
-build=708;
+build=709;
diff --git a/build.txt b/build.txt
index c5dba829..3a89277b 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-708
+709