diff --git a/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java b/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java
index 604ff1023..534e7ae6d 100644
--- a/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java
+++ b/src/main/java/noppes/npcs/controllers/data/AuctionClaim.java
@@ -2,6 +2,7 @@ package noppes.npcs.controllers.data;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.api.handler.data.IAuctionClaim;
 import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.config.ConfigMarket;
@@ -209,9 +210,7 @@ public class AuctionClaim implements IAuctionClaim {
         compound.setInteger("Type", type.ordinal());
 
         if (item != null) {
-            NBTTagCompound itemTag = new NBTTagCompound();
-            item.writeToNBT(itemTag);
-            compound.setTag("Item", itemTag);
+            compound.setTag("Item", NoppesUtilServer.writeItem(item, new NBTTagCompound()));
         }
 
         compound.setString("ItemName", itemName != null ? itemName : "");
@@ -235,7 +234,7 @@ public class AuctionClaim implements IAuctionClaim {
         type = EnumClaimType.fromOrdinal(compound.getInteger("Type"));
 
         if (compound.hasKey("Item")) {
-            item = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("Item"));
+            item = NoppesUtilServer.readItem(compound.getCompoundTag("Item"));
         } else {
             item = null;
         }
diff --git a/src/main/java/noppes/npcs/controllers/data/AuctionListing.java b/src/main/java/noppes/npcs/controllers/data/AuctionListing.java
index 93fc70674..0c021174c 100644
--- a/src/main/java/noppes/npcs/controllers/data/AuctionListing.java
+++ b/src/main/java/noppes/npcs/controllers/data/AuctionListing.java
@@ -2,6 +2,7 @@ package noppes.npcs.controllers.data;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.api.handler.data.IAuctionListing;
 import noppes.npcs.api.item.IItemStack;
 import noppes.npcs.config.ConfigMarket;
@@ -214,9 +215,7 @@ public class AuctionListing implements IAuctionListing {
         compound.setString("SellerName", sellerName != null ? sellerName : "");
 
         if (item != null) {
-            NBTTagCompound itemTag = new NBTTagCompound();
-            item.writeToNBT(itemTag);
-            compound.setTag("Item", itemTag);
+            compound.setTag("Item", NoppesUtilServer.writeItem(item, new NBTTagCompound()));
         }
 
         compound.setLong("StartingPrice", startingPrice);
@@ -243,7 +242,7 @@ public class AuctionListing implements IAuctionListing {
         sellerName = compound.getString("SellerName");
 
         if (compound.hasKey("Item")) {
-            item = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("Item"));
+            item = NoppesUtilServer.readItem(compound.getCompoundTag("Item"));
         }
 
         startingPrice = compound.getLong("StartingPrice");