diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49ac842e8..0526151a5 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - Fixed Wireless Crafting Monitor not closing properly (raoulvdberge)
 - Fixed Controller always using energy, even when disabled with redstone (raoulvdberge)
 - Fixed internal crafting inventory not being returned when Controller is broken (raoulvdberge)
+- Fixed bug where autocrafting tasks started on the same tick make the wrong assumption about available items and fluids (Darkere)
+- Fixed bug where the "To craft" amount in the Crafting Preview window is wrong (raoulvdberge)
 - Drastically improved shift clicking performance in Crafting Grid (Darkere)
 - Removed autocrafting engine version from crafting preview screen (raoulvdberge)
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java
index 43e6e2ae4..1da0f77f0 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java
@@ -256,11 +256,11 @@ public class CraftingTask implements ICraftingTask {
 
         if (requested.getItem() != null) {
             ItemStack req = requested.getItem().copy();
-            req.setCount(qty);
+            req.setCount(qty * qtyPerCraft);
             this.toCraft.add(req);
         } else {
             FluidStack req = requested.getFluid().copy();
-            req.setAmount(qty);
+            req.setAmount(qty * qtyPerCraft);
             this.toCraftFluids.add(req);
         }