diff --git a/src/main/java/am2/blocks/tileentities/TileEntityArcaneDeconstructor.java b/src/main/java/am2/blocks/tileentities/TileEntityArcaneDeconstructor.java
index d2d493805..1f53fbcfc 100644
--- a/src/main/java/am2/blocks/tileentities/TileEntityArcaneDeconstructor.java
+++ b/src/main/java/am2/blocks/tileentities/TileEntityArcaneDeconstructor.java
@@ -96,8 +96,10 @@ public void updateEntity(){
 							}
 						}else{
 							if (current_deconstruction_time++ >= DECONSTRUCTION_TIME){
-								for (ItemStack stack : deconstructionRecipe){
-									transferOrEjectItem(stack);
+							        if(getDeconstructionRecipe() == true){
+									for (ItemStack stack : deconstructionRecipe){
+										transferOrEjectItem(stack);
+									}
 								}
 								deconstructionRecipe = null;
 								decrStackSize(0, 1);
@@ -200,7 +202,7 @@ private boolean getDeconstructionRecipe(){
 
 				for (Object o : recipeParts){
 					ItemStack stack = objectToItemStack(o);
-					if (stack != null){
+					if (stack != null && !stack.getItem().hasContainerItem(stack)){
 						stack.stackSize = 1;
 						recipeItems.add(stack.copy());
 					}