diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
index e18908aab..1579f368d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java
@@ -12,6 +12,7 @@ import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.util.NonNullList;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
@@ -20,6 +21,7 @@ import javax.annotation.Nullable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class CraftingPattern implements ICraftingPattern {
     private ICraftingPatternContainer container;
@@ -80,17 +82,19 @@ public class CraftingPattern implements ICraftingPattern {
                             } else if (input instanceof ItemStack) {
                                 ItemStack stripped = Comparer.stripTags(((ItemStack) input).copy());
                                 if (stripped.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
-                                    stripped.setItemDamage(0);
+                                    oreInputs.add(getSubItems(stripped));
+                                } else {
+                                    oreInputs.add(Collections.singletonList(stripped));
                                 }
-                                oreInputs.add(Collections.singletonList(stripped));
                             } else {
                                 List<ItemStack> cleaned = new LinkedList<>();
                                 for (ItemStack in : (List<ItemStack>) input) {
                                     ItemStack stripped = Comparer.stripTags(in.copy());
                                     if (stripped.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
-                                        stripped.setItemDamage(0);
+                                        cleaned.addAll(getSubItems(stripped));
+                                    } else {
+                                        cleaned.add(stripped);
                                     }
-                                    cleaned.add(stripped);
                                 }
                                 oreInputs.add(cleaned);
                             }
@@ -118,7 +122,7 @@ public class CraftingPattern implements ICraftingPattern {
                         if (ids == null || ids.length == 0) {
                             oreInputs.add(Collections.singletonList(Comparer.stripTags(input)));
                         } else {
-                            oreInputs.add(Arrays.stream(ids)
+                            List<ItemStack> oredict = Arrays.stream(ids)
                                 .mapToObj(OreDictionary::getOreName)
                                 .map(OreDictionary::getOres)
                                 .flatMap(List::stream)
@@ -128,8 +132,11 @@ public class CraftingPattern implements ICraftingPattern {
                                     s.setCount(input.getCount());
                                     return s;
                                 })
-                                .collect(Collectors.toList())
-                            );
+                                .flatMap(this::checkOreDictWildcard)
+                                .collect(Collectors.toList());
+                            // Add original stack as first, should prevent some issues
+                            oredict.add(0, Comparer.stripTags(input.copy()));
+                            oreInputs.add(oredict);
                         }
                     }
                 }
@@ -147,6 +154,22 @@ public class CraftingPattern implements ICraftingPattern {
         }
     }
 
+    private Stream<ItemStack> checkOreDictWildcard(ItemStack stack) {
+        List<ItemStack> list = new LinkedList<>();
+        if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
+            list.addAll(getSubItems(stack));
+        } else {
+            list.add(stack);
+        }
+        return list.stream();
+    }
+
+    private List<ItemStack> getSubItems(ItemStack stack) {
+        NonNullList<ItemStack> subItems = NonNullList.create();
+        stack.getItem().getSubItems(stack.getItem(), stack.getItem().getCreativeTab(), subItems);
+        return subItems.stream().map(Comparer::stripTags).collect(Collectors.toList());
+    }
+
     @Override
     public ICraftingPatternContainer getContainer() {
         return container;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java
index f4dbd2226..d78ecdf73 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStepCraft.java
@@ -42,7 +42,7 @@ public class CraftingStepCraft extends CraftingStep {
         if (!super.canStartProcessing()) {
             return false;
         }
-        int compare = CraftingTask.DEFAULT_COMPARE | (pattern.isOredict() ? IComparer.COMPARE_OREDICT : 0);
+        int compare = CraftingTask.DEFAULT_COMPARE;
         for (ItemStack stack : getToInsert()) {
             // This will be a tool, like a hammer
             if (stack.isItemStackDamageable()) {
@@ -66,12 +66,11 @@ public class CraftingStepCraft extends CraftingStep {
     @Override
     public void execute(Deque<ItemStack> toInsertItems, Deque<FluidStack> toInsertFluids) {
         List<ItemStack> actualInputs = new LinkedList<>();
-        int compare = CraftingTask.DEFAULT_COMPARE | (getPattern().isOredict() ? IComparer.COMPARE_OREDICT : 0);
-        if (extractItems(actualInputs, compare, toInsertItems)) {
+        if (extractItems(actualInputs, CraftingTask.DEFAULT_COMPARE, toInsertItems)) {
             IStackList<ItemStack> stackList = API.instance().createItemStackList();
             actualInputs.forEach(stackList::add);
 
-            ItemStack[] took = StackListItem.toCraftingGrid(stackList, toInsert, compare);
+            ItemStack[] took = StackListItem.toCraftingGrid(stackList, toInsert, CraftingTask.DEFAULT_COMPARE);
 
             List<ItemStack> outputs = pattern.isOredict() ? pattern.getOutputs(took) : pattern.getOutputs();
             if (outputs == null) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
index 70ae4fc03..3f1880ad5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
@@ -95,7 +95,7 @@ public class CraftingTask implements ICraftingTask {
             return null;
         }
 
-        int compare = DEFAULT_COMPARE | (pattern.isOredict() ? IComparer.COMPARE_OREDICT : 0);
+        int compare = DEFAULT_COMPARE;
 
         IStackList<ItemStack> inputs = API.instance().createItemStackList();
         IStackList<ItemStack> actualInputs = API.instance().createItemStackList();