diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cb379f86..dfc293d6f 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ### 1.6.16
 - Updated Russian translation (Bytegm)
+- Fixed erroring controller tile entity (ian-rampage)
+- Fixed Inventory Tweaks sorting not respecting locked slots (Landmaster)
+- Fixed OpenComputers driver voiding excess fluids (BlueAgent)
+- Fixed being able to move wireless items in inventory (raoulvdberge, Dabombber)
 
 ### 1.6.15
 - Fixed recipes with more than 1 bucket of fluid not transferring from JEI (Darkere)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
index dbb7b6426..abd5713a9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
@@ -57,6 +57,8 @@ public abstract class ContainerBase extends Container {
     }
 
     protected void addPlayerInventory(int xInventory, int yInventory) {
+        int disabledSlotNumber = getDisabledSlotNumber();
+
         int id = 9;
         
         for (int y = 0; y < 3; y++) {
@@ -73,8 +75,6 @@ public abstract class ContainerBase extends Container {
         
         id = 0;
 
-        int disabledSlotNumber = getDisabledSlotNumber();
-
         for (int i = 0; i < 9; i++) {
             int x = xInventory + i * 18;
             int y = yInventory + 4 + (3 * 18);