diff --git a/common/src/main/java/common/entity/npc/EntityCameraHolder.java b/common/src/main/java/common/entity/npc/EntityCameraHolder.java
index 93e2f886..059bb25c 100755
--- a/common/src/main/java/common/entity/npc/EntityCameraHolder.java
+++ b/common/src/main/java/common/entity/npc/EntityCameraHolder.java
@@ -9,6 +9,10 @@ public class EntityCameraHolder extends EntityNPC {
 		super(world);
 	}
 
+	public int getInventoryCapacity() {
+		return 1;
+	}
+
 	public int getBaseHealth(Random rand) {
 		return 1;
 	}
diff --git a/common/src/main/java/common/entity/npc/EntityDwarf.java b/common/src/main/java/common/entity/npc/EntityDwarf.java
index 8e786314..1e112175 100755
--- a/common/src/main/java/common/entity/npc/EntityDwarf.java
+++ b/common/src/main/java/common/entity/npc/EntityDwarf.java
@@ -8,6 +8,10 @@ public class EntityDwarf extends EntityNPC {
 	public EntityDwarf(World worldIn) {
 		super(worldIn);
 	}
+
+	public int getInventoryCapacity() {
+		return 30;
+	}
 	
 //	public boolean isAggressive() {
 //		return false;
diff --git a/common/src/main/java/common/entity/npc/EntityFireDemon.java b/common/src/main/java/common/entity/npc/EntityFireDemon.java
index e982fff6..2e3262d6 100755
--- a/common/src/main/java/common/entity/npc/EntityFireDemon.java
+++ b/common/src/main/java/common/entity/npc/EntityFireDemon.java
@@ -13,6 +13,10 @@ public class EntityFireDemon extends EntityFlyingNPC {
 		this.tasks.addTask(7, new AIFireballAttack(this, 3, 7, 64.0, 2.0));
 	}
 
+	public int getInventoryCapacity() {
+		return 48;
+	}
+
 //	public boolean isAggressive() {
 //		return true;
 //	}
diff --git a/common/src/main/java/common/entity/npc/EntityGoblin.java b/common/src/main/java/common/entity/npc/EntityGoblin.java
index 55a0ac8d..f387058f 100755
--- a/common/src/main/java/common/entity/npc/EntityGoblin.java
+++ b/common/src/main/java/common/entity/npc/EntityGoblin.java
@@ -9,6 +9,10 @@ public class EntityGoblin extends EntityNPC {
 		super(worldIn);
 	}
 
+	public int getInventoryCapacity() {
+		return 24;
+	}
+
 	public boolean isAggressive(Class<? extends EntityNPC> clazz) {
 		return clazz == EntityHuman.class || clazz == EntityElf.class || clazz == EntityWoodElf.class || clazz == EntityBloodElf.class;
 	}
diff --git a/common/src/main/java/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java
index 5535e4d6..090a58de 100755
--- a/common/src/main/java/common/entity/npc/EntityNPC.java
+++ b/common/src/main/java/common/entity/npc/EntityNPC.java
@@ -204,7 +204,7 @@ public abstract class EntityNPC extends EntityLiving implements IInventory
     private ItemStack mouseItem;
 	private final ItemStack[] armor = new ItemStack[Equipment.ARMOR_SLOTS];
     private final ItemStack[] prevArmor = new ItemStack[this.armor.length];
-	private final ItemStack[] items = new ItemStack[36];
+	private final ItemStack[] items = new ItemStack[this.getInventoryCapacity()];
     private final ItemStack[] prevItems = new ItemStack[this.items.length];
     private int inLove;
     protected Alignment alignment = Alignment.NEUTRAL;
@@ -2753,7 +2753,7 @@ public abstract class EntityNPC extends EntityLiving implements IInventory
 
     public int getInventoryCapacity()
     {
-        return this.getInventory().length;
+        return 36;
     }
     
     // END OTHER
diff --git a/common/src/main/java/common/entity/npc/EntityPrimarch.java b/common/src/main/java/common/entity/npc/EntityPrimarch.java
index 682d756e..1c8e9218 100755
--- a/common/src/main/java/common/entity/npc/EntityPrimarch.java
+++ b/common/src/main/java/common/entity/npc/EntityPrimarch.java
@@ -87,6 +87,10 @@ public class EntityPrimarch extends EntityMobNPC {
 		super(worldIn);
 	}
 
+	public int getInventoryCapacity() {
+		return 48;
+	}
+
 //	public boolean isAggressive() {
 //		return false;
 //	}
diff --git a/common/src/main/java/common/entity/npc/EntitySlime.java b/common/src/main/java/common/entity/npc/EntitySlime.java
index f8df31c3..531ad785 100755
--- a/common/src/main/java/common/entity/npc/EntitySlime.java
+++ b/common/src/main/java/common/entity/npc/EntitySlime.java
@@ -42,6 +42,10 @@ public class EntitySlime extends EntityNPC
         this.noPickup = true;
     }
 
+	public int getInventoryCapacity() {
+		return 60;
+	}
+
 //	public boolean isAggressive() {
 //		return true;
 //	}
diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java
index 1692e8a5..ef37d5a4 100755
--- a/server/src/main/java/server/network/Player.java
+++ b/server/src/main/java/server/network/Player.java
@@ -1981,7 +1981,7 @@ public class Player extends User implements Executor, IPlayer
 	        	if(msg.length() > 30)
 					throw new IllegalArgumentException("Ungültiger Name");
 	        	if(packetIn.getArg() == -1)
-			        this.entity.inventoryContainer.renameItem(5 + Equipment.ARMOR_SLOTS + 27 + this.entity.getSelectedIndex(), msg);
+			        this.entity.inventoryContainer.renameItem(5 + Equipment.ARMOR_SLOTS + this.entity.getSelectedIndex(), msg);
 	        	else
 			        this.entity.openContainer.renameItem(packetIn.getArg(), msg);
 				this.entity.openContainer.detectAndSendChanges();