diff --git a/CHANGELOG.md b/CHANGELOG.md
index e88df4e01..c57a342e8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 - Fixed Regulator mode item and fluid counts not saving properly (raoulvdberge)
 - 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)
+- Removed autocrafting engine version from crafting preview screen (raoulvdberge)
 
 ### 1.8.6
 - Fixed Constructor duplication bug (Darkere)
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 0b8737875..06566b4d7 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
@@ -974,6 +974,7 @@ public class CraftingTask implements ICraftingTask {
                 network.getCraftingManager().getAllContainer(c.getPattern()).forEach(ICraftingPatternContainer::unlock);
             }
         });
+
         for (ItemStack remainder : internalStorage.getStacks()) {
             network.insertItem(remainder, remainder.getCount(), Action.PERFORM);
         }
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
index ac4dbd17b..9d7125b70 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/Network.java
@@ -2,6 +2,7 @@ package com.refinedmods.refinedstorage.apiimpl.network;
 
 import com.refinedmods.refinedstorage.RS;
 import com.refinedmods.refinedstorage.api.autocrafting.ICraftingManager;
+import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTask;
 import com.refinedmods.refinedstorage.api.network.INetwork;
 import com.refinedmods.refinedstorage.api.network.INetworkNodeGraph;
 import com.refinedmods.refinedstorage.api.network.NetworkType;
@@ -203,6 +204,10 @@ public class Network implements INetwork, IRedstoneConfigurable {
 
     @Override
     public void onRemoved() {
+        for (ICraftingTask task : craftingManager.getTasks()) {
+            task.onCancelled();
+        }
+
         nodeGraph.disconnectAll();
     }
 
@@ -323,7 +328,6 @@ public class Network implements INetwork, IRedstoneConfigurable {
         return newStack;
     }
 
-
     @Override
     @Nonnull
     public FluidStack insertFluid(@Nonnull FluidStack stack, int size, Action action) {