diff --git a/CHANGELOG.md b/CHANGELOG.md
index be19baed6..71f1b900b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 1.5.33
 - Added Crafter Manager (raoulvdberge)
 - Fixed Disk Manipulator not extracting items (ineternet)
+- Fixed filter slots not caring about max stack size (raoulvdberge)
 - Various internal refactors (raoulvdberge)
 
 ### 1.5.32
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java b/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java
index b6d86dded..bdab486a4 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RSBlocks.java
@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage;
 import com.raoulvdberge.refinedstorage.block.*;
 
 public final class RSBlocks {
-    // @todo: Switch to registry inject
     public static final BlockController CONTROLLER = new BlockController();
     public static final BlockCable CABLE = new BlockCable();
     public static final BlockGrid GRID = new BlockGrid();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java
index e6ac5e8c8..bf39133fa 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/RSItems.java
@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage;
 import com.raoulvdberge.refinedstorage.item.*;
 
 public final class RSItems {
-    // @todo: Switch to registry inject
     public static final ItemStorageDisk STORAGE_DISK = new ItemStorageDisk();
     public static final ItemWirelessGrid WIRELESS_GRID = new ItemWirelessGrid();
     public static final ItemWirelessFluidGrid WIRELESS_FLUID_GRID = new ItemWirelessFluidGrid();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
index ac8ffac61..0ecf22a9c 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
@@ -87,7 +87,7 @@ public abstract class ContainerBase extends Container {
                     if (dragType == 0) {
                         amount = Math.max(1, amount - 1);
                     } else if (dragType == 1) {
-                        amount = Math.min(64, amount + 1);
+                        amount = Math.min(slot.getStack().getMaxStackSize(), amount + 1);
                     }
 
                     slot.getStack().setCount(amount);