diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java
index c2fe873d6..22002c90b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java
@@ -389,7 +389,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown
 			_deathEffect.removeSpawnedEntities();
 
 			setupChallengeSpawnLocations();
-			System.out.println("Spawns: " + _challenge.getData().getDefinedSpawns().size());
 			_challenge.createMap();
 
 			if (_settings.canMarkSpawnLocations())
@@ -549,6 +548,20 @@ public class BawkBawkBattles extends TeamGame implements IThrown
 		for (Player player : GetPlayers(true))
 		{
 			_playersTeam.SpawnTeleport(player);
+			removeSolidBlock(player.getLocation());
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	private void removeSolidBlock(Location location)
+	{
+		Block block = location.getBlock();
+
+		if (!block.isEmpty() && _challenge.getData().isModifiedBlock(block))
+		{
+			block.setType(Material.AIR);
+			block.setData((byte) 0);
+			_challenge.getData().removeModifiedBlock(block);
 		}
 	}
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/Challenge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/Challenge.java
index f21306c0c..fa6dbd00a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/Challenge.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/Challenge.java
@@ -188,7 +188,7 @@ public abstract class Challenge implements Listener
 	@SuppressWarnings("deprecation")
 	protected Block generateGrass(Block block)
 	{
-		if (!Data.isSpawnLocation(block.getLocation()) && UtilMath.r(4) == 0)
+		if (UtilMath.r(4) == 0)
 		{
 			if (UtilMath.r(8) == 0)
 			{
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeData.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeData.java
index d08b8a011..427ce5879 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeData.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeData.java
@@ -120,6 +120,11 @@ public class ChallengeData
 	{
 		_modifiedBlocks.add(block);
 	}
+	
+	public boolean isModifiedBlock(Block block)
+	{
+		return _modifiedBlocks.contains(block);
+	}
 
 	public void removeModifiedBlock(Block block)
 	{