diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf
index a3e4739af..cc7c6bd5c 100644
--- a/SQF/dayz_code/init/variables.sqf
+++ b/SQF/dayz_code/init/variables.sqf
@@ -505,12 +505,13 @@ if (isNil "DZE_selfTransfuse_Values") then {DZE_selfTransfuse_Values = [12000,15
 if (isNil "DZE_PlotPole") then {DZE_PlotPole = [30,45];};
 DZE_maintainRange = ((DZE_PlotPole select 0)+20);
 if (isNil "DZE_slowZombies") then {DZE_slowZombies = false;};
-if ((toLower worldName) in ["napf","sauerland","tavi"]) then {
-	dayz_minpos = if ((toLower worldName) == "tavi") then {-26000} else {-1000};
-	dayz_maxpos = 26000;
-} else {
-	dayz_minpos = -20000;
-	dayz_maxpos = 20000;
+
+switch (toLower worldName) do {
+	case "napf";
+	case "sauerland" : {dayz_minpos = -1000; dayz_maxpos = 26000;};
+	case "tavi" : {dayz_minpos = -26000; dayz_maxpos = 26000;};
+	case "chernarus" : {dayz_minpos = -1; dayz_maxpos = 16000;};
+	case default {dayz_minpos = -20000; dayz_maxpos = 20000;};
 };
 
 if (isServer) then {
diff --git a/SQF/dayz_code/system/player_spawn_2.sqf b/SQF/dayz_code/system/player_spawn_2.sqf
index 29561b821..d7c0d452d 100644
--- a/SQF/dayz_code/system/player_spawn_2.sqf
+++ b/SQF/dayz_code/system/player_spawn_2.sqf
@@ -142,7 +142,7 @@ while {1 == 1} do {
 
 			_outsideMap = ((dayz_myPosition select 0) < dayz_minpos || (dayz_myPosition select 1) < dayz_minpos || (dayz_myPosition select 0) > dayz_maxpos || (dayz_myPosition select 1) > dayz_maxpos);
 
-			if ((_outsideMap || DZE_Quarantine) && {!r_player_dead} && {!isNull (findDisplay 46)} && {player distance (getMarkerPos "respawn_west") > 200}) then {
+			if ((_outsideMap || DZE_Quarantine) && {!r_player_dead} && {!isNull (findDisplay 46)} && {player distance (getMarkerPos "respawn_west") > 15}) then {
 				DZE_InRadiationZone = true;
 			};
 			player setVariable["posForceUpdate",true,true];