diff --git a/dependencies.gradle b/dependencies.gradle
index 8afad2f4..12f4f01e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -5,7 +5,6 @@ dependencies {
     compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-149-GTNH:dev')
     compile('curse.maven:cofh-core-69162:2388751')
     compile('com.github.GTNewHorizons:waila:1.5.22:dev')
-    compile('com.github.GTNewHorizons:CraftTweaker:3.2.11:dev')
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false }
     compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.2:dev")
 
diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java
index 8f20e6be..7d4ceefe 100644
--- a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java
+++ b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java
@@ -169,7 +169,20 @@ public class WirelessPatternTerminalInventory extends MEMonitorHandler<IAEItemSt
     @Override
     public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack,
             ItemStack newStack) {
-        // NO-OP
+        if (inv == this.crafting) {
+            this.fixCraftingRecipes();
+        }
+    }
+
+    private void fixCraftingRecipes() {
+        if (this.craftingMode) {
+            for (int x = 0; x < this.crafting.getSizeInventory(); x++) {
+                final ItemStack is = this.crafting.getStackInSlot(x);
+                if (is != null) {
+                    is.stackSize = 1;
+                }
+            }
+        }
     }
 
     @Override
@@ -233,6 +246,7 @@ public class WirelessPatternTerminalInventory extends MEMonitorHandler<IAEItemSt
     @Override
     public void setCraftingRecipe(boolean craftingMode) {
         this.craftingMode = craftingMode;
+        this.fixCraftingRecipes();
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java
index 867ee510..6aca96f0 100644
--- a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java
+++ b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java
@@ -2,6 +2,7 @@ package com.glodblock.github.network;
 
 import java.util.Objects;
 
+import com.glodblock.github.inventory.gui.PartOrItemGuiFactory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -74,11 +75,18 @@ public class CPacketPatternValueSet implements IMessage {
                                 new BlockPos(te),
                                 Objects.requireNonNull(context.getSide()),
                                 message.originGui);
+                        } else if (message.originGui.guiFactory instanceof PartOrItemGuiFactory) {
+                            InventoryHandler.openGui(
+                                player,
+                                player.worldObj,
+                                new BlockPos(player.inventory.currentItem, Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), 0),
+                                Objects.requireNonNull(context.getSide()),
+                                message.originGui);
                         } else {
                             InventoryHandler.openGui(
                                 player,
                                 player.worldObj,
-                                new BlockPos(player.inventory.currentItem, 0 , 0),
+                                new BlockPos(player.inventory.currentItem, 0, 0),
                                 Objects.requireNonNull(context.getSide()),
                                 message.originGui);
                         }