diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java
index 19c95f04b..d528bc414 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java
@@ -126,7 +126,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IS
 
     @Override
     public FluidTank getFluidHandler(EnumFacing facing){
-        return facing != EnumFacing.UP ? this.tank : null;
+        return this.tank;
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java
index 3ed13d413..921b75d72 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java
@@ -189,7 +189,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements
 
     @Override
     public FluidTank getFluidHandler(EnumFacing facing){
-        return facing != EnumFacing.DOWN ? this.tank : null;
+        return this.tank;
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java
index e10f9f416..b33c0029e 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java
@@ -41,6 +41,8 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari
             return false;
         }
     };
+    private final FluidHandlerFluidMap handlerMap;
+
     public int currentProcessTime;
     private int lastCanola;
     private int lastOil;
@@ -49,6 +51,10 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari
 
     public TileEntityFermentingBarrel(){
         super("fermentingBarrel");
+
+        this.handlerMap = new FluidHandlerFluidMap();
+        this.handlerMap.addHandler(InitFluids.fluidCanolaOil, this.canolaTank);
+        this.handlerMap.addHandler(InitFluids.fluidOil, this.oilTank);
     }
 
     @Override
@@ -128,14 +134,7 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari
 
     @Override
     public IFluidHandler getFluidHandler(EnumFacing facing){
-        FluidHandlerFluidMap map = new FluidHandlerFluidMap();
-        if(facing != EnumFacing.DOWN){
-            map.addHandler(InitFluids.fluidCanolaOil, this.canolaTank);
-        }
-        if(facing != EnumFacing.UP){
-            map.addHandler(InitFluids.fluidOil, this.oilTank);
-        }
-        return map;
+        return this.handlerMap;
     }
 
     @Override
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java
index 3330b71f6..ce091f340 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java
@@ -157,7 +157,7 @@ public class TileEntityOilGenerator extends TileEntityBase implements ISharingEn
 
     @Override
     public IFluidHandler getFluidHandler(EnumFacing facing){
-        return facing != EnumFacing.DOWN ? this.tank : null;
+        return this.tank;
     }
 
     @Override