diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4178ce04e..a6f28e62d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,11 @@
 # Refined Storage Changelog
 
-### 0.7.17-pre1
-When updating to this version, you'll have to break and replace your controller.
-
+### 0.7.17
 **Bugfixes**
-- Fixed controller not working after leaving chunk
-- Fixed machines not working when leaving chunk
 - Fixed getting wrong items back in grid
 - Fixed wrong item getting crafted
 - Updated Forge to 1969
 - Updated JEI
-- Rewrote storage networks: they are now saved to disk, so big systems won't lag when rejoining a chunk
 
 **Features**
 - New crafting settings gui
diff --git a/build.gradle b/build.gradle
index e2b7afccc..d587f542f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "0.7.17-pre1"
+version = "0.7.17"
 group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 
diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
index 1dcb67107..df43040ea 100755
--- a/src/main/java/refinedstorage/RefinedStorage.java
+++ b/src/main/java/refinedstorage/RefinedStorage.java
@@ -19,7 +19,7 @@ import refinedstorage.proxy.CommonProxy;
 @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION)
 public final class RefinedStorage {
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "0.7.17-pre1";
+    public static final String VERSION = "0.7.17";
 
     public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
 
diff --git a/src/main/java/refinedstorage/tile/TileSlave.java b/src/main/java/refinedstorage/tile/TileSlave.java
index adf650dc2..749bca0de 100755
--- a/src/main/java/refinedstorage/tile/TileSlave.java
+++ b/src/main/java/refinedstorage/tile/TileSlave.java
@@ -102,7 +102,7 @@ public abstract class TileSlave extends TileBase implements INetworkSlave, ISync
 
         if (network == null) {
             if (controller != null) {
-                connect(world, network);
+                connect(world, controller);
             }
         } else {
             if (controller == null) {
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index e2dee46c8..bcbb66061 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -165,13 +165,13 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
 
             wirelessGridHandler.update();
 
-            if (type == EnumControllerType.NORMAL && energyUsage > 0) {
+            if (getType() == EnumControllerType.NORMAL && energyUsage > 0) {
                 if (energy.getEnergyStored() - energyUsage >= 0) {
                     energy.extractEnergy(energyUsage, false);
                 } else {
                     energy.setEnergyStored(0);
                 }
-            } else if (type == EnumControllerType.CREATIVE) {
+            } else if (getType() == EnumControllerType.CREATIVE) {
                 energy.setEnergyStored(energy.getMaxEnergyStored());
             }
 
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index e67f7d662..f17c3a1cf 100755
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
       "modid": "refinedstorage",
       "name": "Refined Storage",
       "description": "A Minecraft mod all about storage.",
-      "version": "0.7.17-pre1",
+      "version": "0.7.17",
       "mcversion": "1.9.4",
       "url": "",
       "updateUrl": "",