diff --git a/src/main/java/com/legacy/aether/tileentity/TileEntityEnchanter.java b/src/main/java/com/legacy/aether/tileentity/TileEntityEnchanter.java
index ef690d4..e2c78af 100644
--- a/src/main/java/com/legacy/aether/tileentity/TileEntityEnchanter.java
+++ b/src/main/java/com/legacy/aether/tileentity/TileEntityEnchanter.java
@@ -64,8 +64,13 @@ public class TileEntityEnchanter extends AetherTileEntity {
 
 					EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(this.getStackInSlot(0)), result);
 
-					if (this.getStackInSlot(2) != null) {
-						result.stackSize += (this.getStackInSlot(2).stackSize + 1);
+					if (this.getStackInSlot(0).hasTagCompound())
+					{
+						result.setTagCompound(this.getStackInSlot(0).getTagCompound());
+					}
+
+					if (this.getStackInSlot(2) != null && this.getStackInSlot(2).isStackable()) {
+						result.stackSize += (this.getStackInSlot(2).stackSize);
 
 						this.setInventorySlotContents(2, result);
 					} else {
@@ -105,7 +110,7 @@ public class TileEntityEnchanter extends AetherTileEntity {
 			AetherEnchantment enchantment = AetherAPI.instance().getEnchantment(itemstack);
 
 			if (enchantment != null) {
-				if (this.getStackInSlot(2) == null || (enchantment.getOutput().getItem() == this.getStackInSlot(2).getItem() && enchantment.getOutput().getItemDamage() == this.getStackInSlot(2).getItemDamage())) {
+				if (this.getStackInSlot(2) == null || (enchantment.getOutput().getItem() == this.getStackInSlot(2).getItem() && enchantment.getOutput().getItemDamage() == this.getStackInSlot(2).getItemDamage() && this.getStackInSlot(2).isStackable())) {
 					this.currentEnchantment = enchantment;
 					this.ticksRequired = this.currentEnchantment.getTimeRequired();
 					this.addEnchantmentWeight(itemstack);