diff --git a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
index c858062c..961296d1 100644
--- a/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
+++ b/src/main/java/com/pahimar/ee3/exchange/EnergyValueRegistry.java
@@ -579,7 +579,7 @@ public class EnergyValueRegistry {
                             uncomputedStacks.removeIf(wrappedStack -> uncomputedStacks.contains(WrappedStack.wrap(recipeOutput, 1)));
 
                             if (ConfigurationHandler.Settings.energyValueDebugLoggingEnabled) {
-                                LogHelper.info(ENERGY_VALUE_MARKER, "Pass {}: Calculated value {} for object {}", passNumber, computedOutputValue, recipeOutput);
+                                LogHelper.info(ENERGY_VALUE_MARKER, "Pass {}: Calculated value {} for object {}", passNumber, computedOutputValue, WrappedStack.wrap(recipeOutput, 1));
                             }
 
                             tempComputedMap.put(WrappedStack.wrap(recipeOutput), computedOutputValue);
diff --git a/src/main/java/com/pahimar/ee3/exchange/WrappedStack.java b/src/main/java/com/pahimar/ee3/exchange/WrappedStack.java
index f552fe18..04cdeddf 100644
--- a/src/main/java/com/pahimar/ee3/exchange/WrappedStack.java
+++ b/src/main/java/com/pahimar/ee3/exchange/WrappedStack.java
@@ -6,7 +6,6 @@ import com.pahimar.ee3.util.ItemHelper;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -50,15 +49,9 @@ public class WrappedStack implements Comparable<WrappedStack>, JsonDeserializer<
             if (((ItemStack) object).getItem() != null)
             {
                 ItemStack itemStackObject = (ItemStack) object;
-                ItemStack itemStack = new ItemStack(itemStackObject.getItem(), itemStackObject.stackSize, itemStackObject.getItemDamage());
-                if (itemStackObject.stackTagCompound != null)
-                {
-                    itemStack.stackTagCompound = (NBTTagCompound) itemStackObject.stackTagCompound.copy();
-                }
                 objectType = "itemstack";
-                stackSize = itemStack.stackSize;
-                itemStack.stackSize = 1;
-                wrappedStack = itemStack;
+                stackSize = ((ItemStack) object).stackSize;
+                wrappedStack = ItemHelper.clone((ItemStack) object, 1);
             }
             else
             {
@@ -145,11 +138,9 @@ public class WrappedStack implements Comparable<WrappedStack>, JsonDeserializer<
 
         if (object instanceof ItemStack)
         {
-            ItemStack itemStack = ((ItemStack) object).copy();
             objectType = "itemstack";
             this.stackSize = stackSize;
-            itemStack.stackSize = 1;
-            wrappedStack = itemStack;
+            wrappedStack = ItemHelper.clone((ItemStack) object, 1);
         }
         else if (object instanceof OreStack)
         {