diff --git a/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java b/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java
index a56be317..311976fc 100644
--- a/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java
+++ b/src/main/java/com/buuz135/functionalstorage/inventory/BigInventoryHandler.java
@@ -72,7 +72,7 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) {
         if (slot < type.getSlots()){
             BigStack bigStack = this.storedStacks.get(slot);
             if (bigStack.getStack().isEmpty()) return ItemStack.EMPTY;
-            amount = Math.min(amount, bigStack.getStack().getMaxStackSize());
+            amount = Math.min(amount, getSlotLimit(slot));
             if (!isCreative() && bigStack.getAmount() <= amount) {
                 ItemStack out = bigStack.getStack().copy();
                 int newAmount = bigStack.getAmount();
diff --git a/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java b/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java
index 7f4e9b5d..4a91a7c2 100644
--- a/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java
+++ b/src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java
@@ -122,7 +122,7 @@ public ItemStack extractItem(int slot, int amount, boolean simulate) {
         if (slot < this.slots) {
             CompactingUtil.Result bigStack = this.resultList.get(slot);
             if (bigStack.getResult().isEmpty()) return ItemStack.EMPTY;
-            amount = Math.min(amount, bigStack.getResult().getMaxStackSize());
+            amount = Math.min(amount, getSlotLimit(slot));
             int stackAmount = bigStack.getNeeded() * amount;
             if (!isCreative() && stackAmount >= this.amount) {
                 ItemStack out = bigStack.getResult().copy();