diff --git a/build/build.properties b/build/build.properties
index 27f3785..4c9f512 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -1,3 +1,3 @@
 minecraft_version=1.7.10
-forge_version=10.13.0.1151
+forge_version=10.13.3.1373-1.7.10
 mod_version=1.1.3
diff --git a/src/codechicken/lib/data/MCDataOutputWrapper.java b/src/codechicken/lib/data/MCDataOutputWrapper.java
index 48679d4..89ea270 100644
--- a/src/codechicken/lib/data/MCDataOutputWrapper.java
+++ b/src/codechicken/lib/data/MCDataOutputWrapper.java
@@ -232,7 +232,7 @@ public class MCDataOutputWrapper implements MCDataOutput
         if (fluid == null) {
             writeShort(-1);
         } else {
-            writeShort(fluid.fluidID);
+            writeShort(fluid.getFluidID());
             writeVarInt(fluid.amount);
             writeNBTTagCompound(fluid.tag);
         }
diff --git a/src/codechicken/lib/packet/PacketCustom.java b/src/codechicken/lib/packet/PacketCustom.java
index bd4586b..fe5d32e 100644
--- a/src/codechicken/lib/packet/PacketCustom.java
+++ b/src/codechicken/lib/packet/PacketCustom.java
@@ -34,6 +34,8 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.management.PlayerManager;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.util.EnumMap;
@@ -371,7 +373,7 @@ public final class PacketCustom implements MCDataInput, MCDataOutput
         if (fluid == null) {
             writeShort(-1);
         } else {
-            writeShort(fluid.fluidID);
+            writeShort(fluid.getFluidID());
             writeVarInt(fluid.amount);
             writeNBTTagCompound(fluid.tag);
         }
@@ -465,13 +467,11 @@ public final class PacketCustom implements MCDataInput, MCDataOutput
     }
 
     public FluidStack readFluidStack() {
-        FluidStack fluid = null;
-        short fluidID = readShort();
+        Fluid fluid = FluidRegistry.getFluid(readShort());
+        if(fluid == null)
+            fluid = FluidRegistry.WATER;
 
-        if (fluidID >= 0)
-            fluid = new FluidStack(fluidID, readVarInt(), readNBTTagCompound());
-
-        return fluid;
+        return new FluidStack(fluid, readVarInt(), readNBTTagCompound());
     }
 
     public FMLProxyPacket toPacket() {