diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java
index e040ea9a3..7d3a105c1 100644
--- a/src/main/java/appeng/core/sync/GuiBridge.java
+++ b/src/main/java/appeng/core/sync/GuiBridge.java
@@ -241,7 +241,7 @@ public enum GuiBridge implements IGuiHandler {
                 } else if (x >= 0 && x < player.inventory.mainInventory.size()) {
                     it = player.inventory.getStackInSlot(x);
                 }
-            } else if (y == 1 && z == 0) {
+            } else if (y == 1 && z == Integer.MIN_VALUE) {
                 if (stem) {
                     if (player.openContainer instanceof IInventorySlotAware) {
                         int slot = ((IInventorySlotAware) player.openContainer).getInventorySlot();
diff --git a/src/main/java/appeng/core/sync/packets/PacketTerminalUse.java b/src/main/java/appeng/core/sync/packets/PacketTerminalUse.java
index 5e4d90eab..62de87ebd 100644
--- a/src/main/java/appeng/core/sync/packets/PacketTerminalUse.java
+++ b/src/main/java/appeng/core/sync/packets/PacketTerminalUse.java
@@ -1,5 +1,6 @@
 package appeng.core.sync.packets;
 
+import appeng.api.util.AEPartLocation;
 import appeng.core.sync.AppEngPacket;
 import appeng.core.sync.network.INetworkInfo;
 import appeng.items.tools.powered.Terminal;
@@ -31,17 +32,16 @@ public class PacketTerminalUse extends AppEngPacket {
     @Override
     public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player) {
         NonNullList<ItemStack> mainInventory = player.inventory.mainInventory;
-        for (int i = 0; i < mainInventory.size(); i++) {
-            ItemStack is = mainInventory.get(i);
+        for (ItemStack is : mainInventory) {
             if (terminal.getItemDefinition().isSameAs(is)) {
-                Platform.openGUI(player, i, terminal.getBridge(), false);
+                Platform.openGUI(player, null, AEPartLocation.INTERNAL, terminal.getBridge());
                 return;
             }
         }
         for (int i = 0; i < BaublesApi.getBaublesHandler(player).getSlots(); i++) {
             ItemStack is = BaublesApi.getBaublesHandler(player).getStackInSlot(i);
             if (terminal.getItemDefinition().isSameAs(is)) {
-                Platform.openGUI(player, i, terminal.getBridge(), true);
+                Platform.openGUI(player, null, AEPartLocation.INTERNAL, terminal.getBridge());
                 break;
             }
         }
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index a20ba333f..d59e0290e 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -324,8 +324,9 @@ public class Platform {
         }
 
         int x;
-        int y = 0;
-        int z = 0;
+        int y;
+        int z;
+
         if (tile != null) {
             x = tile.getPos().getX();
             y = tile.getPos().getY();
@@ -333,10 +334,12 @@ public class Platform {
         } else {
             if (p.openContainer instanceof IInventorySlotAware) {
                 x = ((IInventorySlotAware) p.openContainer).getInventorySlot();
-                y = ((IInventorySlotAware)p.openContainer).isBaubleSlot() ? 1 : 0;
+                y = ((IInventorySlotAware) p.openContainer).isBaubleSlot() ? 1 : 0;
             } else {
                 x = p.inventory.currentItem;
+                y = 0;
             }
+            z = Integer.MIN_VALUE;
         }
 
         if ((type.getType().isItem() && tile == null) || type.hasPermissions(tile, x, y, z, side, p)) {
@@ -350,18 +353,6 @@ public class Platform {
         }
     }
 
-    public static void openGUI(@Nonnull final EntityPlayer p, int i, @Nonnull final GuiBridge type, boolean isBauble) {
-        if (isClient()) {
-            return;
-        }
-
-        if (type.getType().isItem()) {
-            if (type.getType() == GuiHostType.ITEM) {
-                p.openGui(AppEng.instance(), type.ordinal() << 4, p.getEntityWorld(), i, isBauble ? 1 : 0, 0);
-            }
-        }
-    }
-
     /*
      * returns true if the code is on the client.
      */