diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3762e332e..13a72b4a5 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Solderer now accepts items from any side, allowing easier automation (raoulvdberge)
 - Solderer is now intelligent about items in slots, and will only accept an item if it is part of a recipe (raoulvdberge)
 - Changed recipe for upgrades in the Solderer, they now just take 1 of the unique item instead of 2, using redstone instead (raoulvdberge)
+- Fixed fluid autocrafting scheduling too much crafting tasks for buckets (raoulvdberge)
 - Fixed blocks in hand facing wrong direction (raoulvdberge)
 - Updated to Forge 2088 (raoulvdberge)
 
diff --git a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java b/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java
index a8aa79caa..ac2f73356 100755
--- a/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java
+++ b/src/main/java/refinedstorage/apiimpl/storage/fluid/FluidUtils.java
@@ -7,9 +7,9 @@ import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
-import refinedstorage.api.autocrafting.ICraftingPattern;
 import refinedstorage.api.network.INetworkMaster;
 import refinedstorage.api.network.NetworkUtils;
+import refinedstorage.api.storage.CompareUtils;
 
 public final class FluidUtils {
     public static final ItemStack EMPTY_BUCKET = new ItemStack(Items.BUCKET);
@@ -51,11 +51,7 @@ public final class FluidUtils {
                 if (result != null) {
                     result.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null).fill(NetworkUtils.extractFluid(network, fluidStack, Fluid.BUCKET_VOLUME), true);
                 } else {
-                    ICraftingPattern pattern = NetworkUtils.getPattern(network, EMPTY_BUCKET);
-
-                    if (pattern != null) {
-                        network.addCraftingTask(NetworkUtils.createCraftingTask(network, pattern));
-                    }
+                    NetworkUtils.scheduleCraftingTaskIfUnscheduled(network, EMPTY_BUCKET, 1, CompareUtils.COMPARE_DAMAGE | CompareUtils.COMPARE_NBT);
                 }
             }
         }