diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java
index 04e5128..fb3a617 100644
--- a/src/nl/Steffion/BlockHunt/ArenaHandler.java
+++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java
@@ -220,6 +220,7 @@ public class ArenaHandler {
 			W.pHealth.remove(player);
 			player.setFoodLevel(W.pFood.get(player));
 			W.pFood.remove(player);
+			W.pBlock.remove(player);
 
 			for (Player pl : Bukkit.getOnlinePlayers()) {
 				pl.showPlayer(player);
diff --git a/src/nl/Steffion/BlockHunt/BlockHunt.java b/src/nl/Steffion/BlockHunt/BlockHunt.java
index 4551b57..f2e3a61 100644
--- a/src/nl/Steffion/BlockHunt/BlockHunt.java
+++ b/src/nl/Steffion/BlockHunt/BlockHunt.java
@@ -122,6 +122,7 @@ public class BlockHunt extends JavaPlugin implements Listener {
 				+ W.pluginAutors);
 
 		getServer().getScheduler().runTaskTimer(this, new Runnable() {
+			@SuppressWarnings("deprecation")
 			@Override
 			public void run() {
 				for (Arena arena : W.arenaList) {
@@ -227,6 +228,7 @@ public class BlockHunt extends JavaPlugin implements Listener {
 											blockCount);
 									arenaPlayer.getInventory().setHelmet(
 											new ItemStack(block));
+									W.pBlock.put(arenaPlayer, block);
 
 									if (block.getDurability() != 0) {
 										MessageM.sendFMessage(
@@ -343,6 +345,14 @@ public class BlockHunt extends JavaPlugin implements Listener {
 								ItemStack block = player.getInventory()
 										.getItem(8);
 
+								if (block == null) {
+									if (W.pBlock.get(player) != null) {
+										block = W.pBlock.get(player);
+										player.getInventory().setItem(8, block);
+										player.updateInventory();
+									}
+								}
+
 								if (moveLoc != null) {
 									if (moveLoc.getX() == pLoc.getX()
 											&& moveLoc.getY() == pLoc.getY()
@@ -359,8 +369,6 @@ public class BlockHunt extends JavaPlugin implements Listener {
 													for (Player pl : Bukkit
 															.getOnlinePlayers()) {
 														if (!pl.equals(player)) {
-															// pl.hidePlayer(player);
-															// W.dcAPI.undisguisePlayer(player);
 															pl.hidePlayer(player);
 															pl.sendBlockChange(
 																	pBlock.getLocation(),
diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDeathEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDeathEvent.java
index dcf531e..86dd637 100644
--- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDeathEvent.java
+++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerDeathEvent.java
@@ -23,6 +23,7 @@ public class OnPlayerDeathEvent implements Listener {
 				event.getDrops().clear();
 				event.setDroppedExp(0);
 				W.dcAPI.undisguisePlayer(player);
+				W.pBlock.remove(player);
 
 				if (!arena.seekers.contains(player)) {
 					arena.seekers.add(player);
diff --git a/src/nl/Steffion/BlockHunt/W.java b/src/nl/Steffion/BlockHunt/W.java
index 66db049..948a032 100644
--- a/src/nl/Steffion/BlockHunt/W.java
+++ b/src/nl/Steffion/BlockHunt/W.java
@@ -46,6 +46,7 @@ public class W {
 	public static HashMap<Player, Integer> pEXPL = new HashMap<Player, Integer>();
 	public static HashMap<Player, Double> pHealth = new HashMap<Player, Double>();
 	public static HashMap<Player, Integer> pFood = new HashMap<Player, Integer>();
+	public static HashMap<Player, ItemStack> pBlock = new HashMap<Player, ItemStack>();
 
 	public static HashMap<Player, Location> moveLoc = new HashMap<Player, Location>();
 	public static HashMap<Player, Location> hiddenLoc = new HashMap<Player, Location>();