diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/StevenDimDoors/mod_pocketDim/EventHookContainer.java
index 5a7f80d..abdeafb 100644
--- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java
+++ b/StevenDimDoors/mod_pocketDim/EventHookContainer.java
@@ -76,10 +76,15 @@ public class EventHookContainer
     	Entity entity = event.entity;
     	if(entity instanceof EntityPlayer&&entity.worldObj.provider instanceof PocketProvider && this.properties.LimboEnabled)
     	{
+    		if(!this.properties.LimboReturnsInventoryEnabled)
+    		{
+    			((EntityPlayer)entity).inventory.clearInventory(-1, -1);
+    		}
     		ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(entity.worldObj.rand);
     		DDTeleporter.teleportEntity(entity, new Point4D(coords.posX,coords.posY,coords.posZ,mod_pocketDim.properties.LimboDimensionID));
     		((EntityLiving) entity).setEntityHealth(20);
     		event.setCanceled(true);
+    		return false;
     	}
     	return true;
     }
diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index c395c11..487ffe3 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -115,8 +115,6 @@ public class mod_pocketDim
 	public static BiomeGenBase pocketBiome;
 
 	public static PlayerRespawnTracker tracker;
-
-	public static HashMap<String,ArrayList<EntityItem>> limboSpawnInventory = new HashMap<String,ArrayList<EntityItem>>();
 	
 	public static boolean isPlayerWearingGoogles = false;