diff --git a/src/engine/net/client/msg/ManageNPCMsg.java b/src/engine/net/client/msg/ManageNPCMsg.java
index 5b68d9ba..8f37770a 100644
--- a/src/engine/net/client/msg/ManageNPCMsg.java
+++ b/src/engine/net/client/msg/ManageNPCMsg.java
@@ -443,15 +443,13 @@ public class ManageNPCMsg extends ClientNetMsg {
 
                         for (Item item : itemList) {
 
-                            ItemBase ib = item.getItemBase();
-                            ItemTemplate template = ItemTemplate.templates.get(ib);
                             writer.put((byte) 0); // ? Unknown45
                             writer.putInt(item.getObjectType().ordinal());
                             writer.putInt(item.getObjectUUID());
 
                             writer.putInt(0);
                             writer.putInt(item.getTemplateID());
-                            writer.putInt(template.item_value);
+                            writer.putInt(item.template.item_value);
 
                             long timeLife = item.getDateToUpgrade() - System.currentTimeMillis();
 
diff --git a/src/engine/objects/Item.java b/src/engine/objects/Item.java
index f035e86e..b23c6a33 100644
--- a/src/engine/objects/Item.java
+++ b/src/engine/objects/Item.java
@@ -192,7 +192,7 @@ public class Item extends AbstractWorldObject {
         if (includeSlot)
             writer.putInt(item.equipSlot.ordinal());
         writer.putInt(0); // Pad
-        writer.putInt(item.getItemBase().getUUID());
+        writer.putInt(item.templateID);
 
         writer.putInt(item.getObjectType().ordinal());
         writer.putInt(item.getObjectUUID());
@@ -397,7 +397,6 @@ public class Item extends AbstractWorldObject {
         if (includeSlot)
             reader.getInt();
         reader.getInt();
-        int itemBase = reader.getInt(); //itemBase
         int objectType = reader.getInt(); //object type;
         int UUID = reader.getInt();
         for (int i = 0; i < 14; i++) {