diff --git a/common/buildcraft/factory/TileTank.java b/common/buildcraft/factory/TileTank.java
index 846e9803..013c0009 100644
--- a/common/buildcraft/factory/TileTank.java
+++ b/common/buildcraft/factory/TileTank.java
@@ -82,9 +82,18 @@ public class TileTank extends TileBuildCraft implements ITankContainer
     public void readFromNBT(NBTTagCompound data)
     {
         super.readFromNBT(data);
-        LiquidStack liquid = new LiquidStack(0, 0, 0);
-        liquid.readFromNBT(data.getCompoundTag("tank"));
-        tank.setLiquid(liquid);
+        
+        if(data.hasKey("stored") && data.hasKey("liquidId"))
+        {
+	        LiquidStack liquid = new LiquidStack(data.getInteger("liquidId"), data.getInteger("stored"), 0);
+	        tank.setLiquid(liquid);
+        }
+        else
+        {        
+	        LiquidStack liquid = new LiquidStack(0, 0, 0);
+	        liquid.readFromNBT(data.getCompoundTag("tank"));
+	        tank.setLiquid(liquid);
+        }
     }
 
     @Override