diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt
index 682c4eeb9..fbb960428 100644
--- a/CHANGE LOG 1.0.6.1.txt	
+++ b/CHANGE LOG 1.0.6.1.txt	
@@ -15,6 +15,8 @@
 [FIXED] M24 ammo prices are now 1/4 of DMR ammo prices, so no profit can be made by combining M24 rounds. @looter809 @ebayShopper
 [FIXED] Full cinderblock walls now work properly with vector building #1813. @DeVloek @icomrade
 [FIXED] Death message showing incorrectly when players suicide under certain conditions. @oiad @ebayShopper
-[FIXED] WoodenArrow and other WeaponHolderBase inherited objects catching on fire when destroyed due to destrType. #1815 @DeVloek @ebayShopper
+[FIXED] WoodenArrow and other WeaponHolderBase inherited objects catching fire when destroyed due to destrType. #1815 @DeVloek @ebayShopper
+[FIXED] Arrows floating in air when shot at same position against a wall multiple times. #1815 @DeVloek @ebayShopper
+[FIXED] Swimming in ground glitch when relogging at certain positions on certain maps like Napf and Tavi. @ebayShopper
 
 [INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.
\ No newline at end of file
diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf
index 591b8efcc..eba23aca0 100644
--- a/SQF/dayz_code/compile/player_switchModel.sqf
+++ b/SQF/dayz_code/compile/player_switchModel.sqf
@@ -113,12 +113,7 @@ _switchUnit = {
 	_rndx = floor(random 100);
 	_rndy = floor(random 100);
 	_oldUnit setPosATL [(respawn_west_original select 0) + _rndx, (respawn_west_original select 1) + _rndy, 0];
-	if (surfaceIsWater respawn_west_original) then {
-		//Prevent swimming in ground glitch if respawn is in water
-		_newUnit setPosATL [_position select 0,_position select 1,(_position select 2)+.1];
-	} else {
-		_newUnit setPosATL _position;
-	};
+	_newUnit setPosATL [_position select 0,_position select 1,(_position select 2)+.1]; //Prevents swimming in ground glitch
 	removeAllWeapons _oldUnit;
 	{_oldUnit removeMagazine _x;} count magazines _oldUnit;
 	if !(isNull _oldUnit) then {deleteVehicle _oldUnit;};
diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm
index 1d8f4d1c7..0b57a2867 100644
--- a/SQF/dayz_code/system/player_monitor.fsm
+++ b/SQF/dayz_code/system/player_monitor.fsm
@@ -996,7 +996,7 @@ class FSM
                          "	[player,2000] spawn BIS_fnc_halo;" \n
                          "} else {" \n
                          "	player setDir _setDir;" \n
-                         "	player setPosATL _setPos;" \n
+                         "	player setPosATL [_setPos select 0,_setPos select 1,(_setPos select 2)+.1]; //Prevents swimming in ground glitch" \n
                          "};" \n
                          "" \n
                          "player setVelocity [0,0,0.5];" \n