diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ac8d6910..8f4741149 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Refined Storage Changelog
 
 ### 1.0
-**NOTE:** Due to the new crafting system, all Crafting Patterns made before 1.x have to be re-made.
+**NOTE:** Due to the new crafting system, all Crafting Patterns made before 1.0 have to be re-made.
 
 - Implemented multithreaded autocrafting (raoulvdberge)
 - Processing patterns now hold their items back for pushing until all the required items are gathered from the system (raoulvdberge)
@@ -11,9 +11,10 @@
 - Interface now supports Crafting Upgrade (raoulvdberge)
 - When shift clicking a recipe in the Crafting Grid, the player inventory is now leveraged as well (raoulvdberge)
 - Fixed machines breaking on long distances (raoulvdberge)
-- Fixed controller rebuilding network graph on energy change (raoulvdberge)
+- Fixed Controller rebuilding network graph on energy change (raoulvdberge)
 - Fixed fluids not caring about NBT tags (raoulvdberge)
 - Fixed fluids that have less than 1 bucket stored render only partly in Fluid Grid (raoulvdberge)
+- Fixed Fluid Interface voiding bucket when shift clicking to out slot (raoulvdberge)
 
 ### 0.9.4
 - Little fixes in German translation (ThexXTURBOXx)
diff --git a/src/main/java/refinedstorage/container/ContainerFluidInterface.java b/src/main/java/refinedstorage/container/ContainerFluidInterface.java
index 8c75714dd..adbf382f0 100755
--- a/src/main/java/refinedstorage/container/ContainerFluidInterface.java
+++ b/src/main/java/refinedstorage/container/ContainerFluidInterface.java
@@ -16,7 +16,6 @@ public class ContainerFluidInterface extends ContainerBase {
         }
 
         addSlotToContainer(new SlotItemHandler(fluidInterface.getIn(), 0, 44, 32));
-        // @TODO: Fix shift click bug void
         addSlotToContainer(new SlotSpecimenFluid(!fluidInterface.getWorld().isRemote, fluidInterface.getOut(), 0, 116, 32));
 
         addPlayerInventory(8, 122);
@@ -35,8 +34,8 @@ public class ContainerFluidInterface extends ContainerBase {
                 if (!mergeItemStack(stack, 4 + 2, inventorySlots.size(), false)) {
                     return null;
                 }
-            } else if (!mergeItemStack(stack, 0, 4 + 2, false)) {
-                return null;
+            } else if (!mergeItemStack(stack, 0, 4 + 1, false)) {
+                return mergeItemStackToSpecimen(stack, 5, 6);
             }
 
             if (stack.stackSize == 0) {