diff --git a/CHANGELOG.md b/CHANGELOG.md
index 099812e70..6933f2d80 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.6.14
+- Fixed server crash (raoulvdberge)
+
 ### 1.6.13
 - Fixed Interface with Crafting Upgrade being stuck if an earlier item configuration has missing items or fluids (raoulvdberge)
 - Added keybindings to open wireless items. The default one set to open a Wireless Crafting Grid from Refined Storage Addons is CTRL + G (raoulvdberge)
diff --git a/build.gradle b/build.gradle
index b2d3a53ac..82e983658 100755
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.6.13"
+version = "1.6.14"
 def env = System.getenv()
 if (env.BUILD_NUMBER) {
     version = version + "-" + "${env.BUILD_NUMBER}"
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java
index fd04dc27a..a64dd4550 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java
@@ -11,11 +11,9 @@ import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
 import com.raoulvdberge.refinedstorage.render.color.ItemColorPattern;
 import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelPattern;
-import com.raoulvdberge.refinedstorage.render.teisr.TileEntityItemStackRendererPattern;
 import com.raoulvdberge.refinedstorage.util.RenderUtils;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
@@ -51,8 +49,6 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider {
 
     public ItemPattern() {
         super(new ItemInfo(RS.ID, "pattern"));
-
-        setTileEntityItemStackRenderer(new TileEntityItemStackRendererPattern());
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
index 561ab3cd1..d69b61ee0 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
@@ -1,11 +1,13 @@
 package com.raoulvdberge.refinedstorage.proxy;
 
+import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.RSKeyBindings;
 import com.raoulvdberge.refinedstorage.block.BlockBase;
 import com.raoulvdberge.refinedstorage.gui.KeyInputListener;
 import com.raoulvdberge.refinedstorage.item.ItemBase;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
 import com.raoulvdberge.refinedstorage.render.collision.BlockHighlightListener;
+import com.raoulvdberge.refinedstorage.render.teisr.TileEntityItemStackRendererPattern;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemMeshDefinition;
@@ -47,6 +49,8 @@ public class ProxyClient extends ProxyCommon implements IModelRegistration {
 
         MinecraftForge.EVENT_BUS.register(new BlockHighlightListener());
         MinecraftForge.EVENT_BUS.register(new KeyInputListener());
+
+        RSItems.PATTERN.setTileEntityItemStackRenderer(new TileEntityItemStackRendererPattern());
     }
 
     @Override