diff --git a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java
index 2030a33c..3d1c29a8 100644
--- a/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java
+++ b/HolographicDisplays/Plugin/com/gmail/filoghost/holographicdisplays/nms/v1_11_R1/EntityNMSItem.java
@@ -35,7 +35,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
 	
 	public EntityNMSItem(World world, CraftItemLine piece) {
 		super(world);
-		super.pickupDelay = Integer.MAX_VALUE;
+		super.pickupDelay = 32767; // Lock the item pickup delay, also prevents entities from picking up the item
 		this.parentPiece = piece;
 	}
 	
@@ -70,17 +70,6 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
 		}
 	}
 	
-	@Override
-	public ItemStack getItemStack() {
-		// Dirty method to check if the icon is being picked up
-		StackTraceElement[] stacktrace = Thread.currentThread().getStackTrace();
-		if (stacktrace.length > 2 && stacktrace[2].getClassName().contains("EntityInsentient")) {
-			return null; // Try to pickup this, dear entity ignoring the pickupDelay!
-		}
-		
-		return super.getItemStack();
-	}
-	
 	// Method called when a player is near.
 	@Override
 	public void d(EntityHuman human) {
@@ -193,21 +182,21 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
 		if (newItem == null) {
 			newItem = new ItemStack(Blocks.BEDROCK);
 		}
-		
+
 		if (newItem.getTag() == null) {
 			newItem.setTag(new NBTTagCompound());
 		}
-		NBTTagCompound display = newItem.getTag().getCompound("display");
-		
+		NBTTagCompound display = newItem.getTag().getCompound("display"); // Returns a new NBTTagCompound if not existing
 		if (!newItem.getTag().hasKey("display")) {
-		newItem.getTag().set("display", display);
+			newItem.getTag().set("display", display);
 		}
-		
+
 		NBTTagList tagList = new NBTTagList();
 		tagList.add(new NBTTagString(ItemUtils.ANTISTACK_LORE)); // Antistack lore
-		
 		display.set("Lore", tagList);
-		newItem.setCount(0);
+
+		newItem.setCount(1);
+		
 		setItemStack(newItem);
 	}
 	
@@ -226,7 +215,7 @@ public class EntityNMSItem extends EntityItem implements NMSItem {
 		if (pickup) {
 			super.pickupDelay = 0;
 		} else {
-			super.pickupDelay = Integer.MAX_VALUE;
+			super.pickupDelay = 32767;
 		}
 	}