diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java
index 78854012c0c..2ee4d956545 100644
--- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java
+++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java
@@ -37,15 +37,19 @@ public boolean matches (InventoryCrafting par1InventoryCrafting, World par2World
                         ItemStack itemstack1 = (ItemStack) iterator.next();
 
                         // TConstruct.logger.info("Rawr! "+itemstack1.getItemDamage());
-                        if (itemstack.getItem() == itemstack1.getItem() && (itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamage() == itemstack1.getItemDamage()))
+                        if (itemstack.getItem() == itemstack1.getItem())
                         {
                             if (itemstack.getItem() instanceof ToolCore)
                             {
                                 NBTTagCompound tags = itemstack.getTagCompound().getCompoundTag("InfiTool");
                                 if (tags.getBoolean("Broken"))
                                     return false;
+
+                                flag = true;
                             }
-                            flag = true;
+                            else if((itemstack1.getItemDamage() == Short.MAX_VALUE || itemstack.getItemDamage() == itemstack1.getItemDamage()))
+                                flag = true;
+
                             arraylist.remove(itemstack1);
                             break;
                         }