diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java
index bbaf44521..1cd771b60 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java
@@ -73,7 +73,7 @@ public class ContainerGiantChest extends Container{
                     }
                 }
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)){
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, true)){
                 return StackUtil.getNull();
             }
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java
index 7f97b350f..64e1db4be 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java
@@ -126,9 +126,7 @@ public class TileEntityFarmer extends TileEntityInventoryBase implements IFarmer
 
         for(IFarmerBehavior behavior : SORTED_FARMER_BEHAVIORS){
             FarmerResult harvestResult = behavior.tryHarvestPlant(this.world, query, this);
-            if(harvestResult == FarmerResult.SUCCESS || harvestResult == FarmerResult.STOP_PROCESSING){
-                return;
-            }
+            if(harvestResult == FarmerResult.STOP_PROCESSING) return;
             else{
                 for(int i = 0; i < this.slots.getSlots(); i++){
                     ItemStack stack = this.slots.getStackInSlot(i);