diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
index 8ff81833f..89a4ae084 100755
--- a/src/main/java/refinedstorage/RefinedStorage.java
+++ b/src/main/java/refinedstorage/RefinedStorage.java
@@ -25,9 +25,15 @@ public final class RefinedStorage {
     public static final String ID = "refinedstorage";
     public static final String VERSION = "0.8.4";
 
-    public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
+    @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy")
+    public static CommonProxy PROXY;
 
-    public static final CreativeTabs TAB = new CreativeTabs(ID) {
+    @Instance
+    public static RefinedStorage INSTANCE;
+
+    public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
+
+    public final CreativeTabs tab = new CreativeTabs(ID) {
         @Override
         public ItemStack getIconItemStack() {
             return new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_1K);
@@ -39,12 +45,6 @@ public final class RefinedStorage {
         }
     };
 
-    @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy")
-    public static CommonProxy PROXY;
-
-    @Instance
-    public static RefinedStorage INSTANCE;
-
     public List<ItemStack> items = new ArrayList<ItemStack>();
 
     public int cableRfUsage;
diff --git a/src/main/java/refinedstorage/RefinedStorageUtils.java b/src/main/java/refinedstorage/RefinedStorageUtils.java
index 26ef66825..6d66bcad0 100755
--- a/src/main/java/refinedstorage/RefinedStorageUtils.java
+++ b/src/main/java/refinedstorage/RefinedStorageUtils.java
@@ -309,4 +309,8 @@ public final class RefinedStorageUtils {
     public static ICraftingPattern getPatternFromNetwork(INetworkMaster network, ItemStack stack) {
         return network.getPattern(stack, CompareFlags.COMPARE_DAMAGE | CompareFlags.COMPARE_NBT);
     }
+
+    public static boolean hasPattern(INetworkMaster network, ItemStack stack) {
+        return RefinedStorageUtils.getPatternFromNetwork(network, stack) != null;
+    }
 }
diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
index 4ac38aeb8..b48fcbc06 100755
--- a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
+++ b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java
@@ -78,7 +78,7 @@ public class GroupedStorage implements IGroupedStorage {
                 otherStack.stackSize -= stack.stackSize;
 
                 if (otherStack.stackSize == 0) {
-                    if (RefinedStorageUtils.getPatternFromNetwork(network, otherStack) == null) {
+                    if (!RefinedStorageUtils.hasPattern(network, stack)) {
                         stacks.remove(otherStack.getItem(), otherStack);
                     }
                 }
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index 618d525a3..4c49131d1 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -392,14 +392,14 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
     @Override
     public void sendStorageToClient(EntityPlayerMP player) {
-        RefinedStorage.NETWORK.sendTo(new MessageGridUpdate(this), player);
+        RefinedStorage.INSTANCE.network.sendTo(new MessageGridUpdate(this), player);
     }
 
     @Override
     public void sendStorageDeltaToClient(ItemStack stack, int delta) {
         for (EntityPlayer player : worldObj.playerEntities) {
             if (isWatchingGrid(player)) {
-                RefinedStorage.NETWORK.sendTo(new MessageGridDelta(stack, delta, RefinedStorageUtils.getPatternFromNetwork(this, stack) != null), (EntityPlayerMP) player);
+                RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(stack, delta, RefinedStorageUtils.hasPattern(this, stack)), (EntityPlayerMP) player);
             }
         }
     }