diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index 27f429305..7616b98ad 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -302,6 +302,8 @@ public abstract class Game implements Listener
 	public boolean DeadBodiesDeath = true;
 	public int DeadBodiesExpire = -1;
 
+	public boolean FixSpawnFacing = true;
+
 	private IPacketHandler _useEntityPacketHandler;
 	private int _deadBodyCount;
 	private NautHashMap<String, Entity> _deadBodies = new NautHashMap<String, Entity>();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
index 6527ec0ea..ddbd4f68c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameTeam.java
@@ -113,12 +113,15 @@ public class GameTeam
 
 	private Location fixFacing(Location loc)
 	{
-		float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(loc, Host.GetSpectatorLocation()));
-
-		yaw = (int) (yaw / 90) * 90;
-
-		loc = loc.clone();
-		loc.setYaw(yaw);
+		if (Host.FixSpawnFacing)
+		{
+			float yaw = UtilAlg.GetYaw(UtilAlg.getTrajectory2d(loc, Host.GetSpectatorLocation()));
+	
+			yaw = (int) (yaw / 90) * 90;
+	
+			loc = loc.clone();
+			loc.setYaw(yaw);
+		}
 
 		return loc;
 	}