diff --git a/src/main/java/com/darkona/adventurebackpack/inventory/InventoryAdventure.java b/src/main/java/com/darkona/adventurebackpack/inventory/InventoryAdventure.java
index 94d61887..eb2d9777 100644
--- a/src/main/java/com/darkona/adventurebackpack/inventory/InventoryAdventure.java
+++ b/src/main/java/com/darkona/adventurebackpack/inventory/InventoryAdventure.java
@@ -82,6 +82,7 @@ public int getInventoryStackLimit() {
     @Override
     public void markDirty() {
         dirtyInventory();
+        saveToNBT(containerStack.stackTagCompound);
     }
 
     @Override
diff --git a/src/main/java/com/darkona/adventurebackpack/inventory/InventoryCoalJetpack.java b/src/main/java/com/darkona/adventurebackpack/inventory/InventoryCoalJetpack.java
index a8749722..60c6b30e 100644
--- a/src/main/java/com/darkona/adventurebackpack/inventory/InventoryCoalJetpack.java
+++ b/src/main/java/com/darkona/adventurebackpack/inventory/InventoryCoalJetpack.java
@@ -13,11 +13,11 @@
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.common.util.Constants.NBT;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 
 import com.darkona.adventurebackpack.common.Constants;
+import com.darkona.adventurebackpack.reference.GeneralReference;
 
 public class InventoryCoalJetpack extends InventoryAdventure {
 
@@ -77,7 +77,7 @@ public void loadFromNBT(NBTTagCompound compound) {
         coolTicks = jetpackTag.getInteger("coolTicks");
         currentItemBurnTime = jetpackTag.getInteger("currentBurn");
         if (steamTank.getFluid() != null && steamTank.getFluid().getFluid().getName().equals("water")) {
-            steamTank.setFluid(new FluidStack(FluidRegistry.getFluid("steam"), steamTank.getFluid().amount));
+            steamTank.setFluid(new FluidStack(GeneralReference.getSteamFluid(), steamTank.getFluid().amount));
         }
     }
 
diff --git a/src/main/java/com/darkona/adventurebackpack/item/ItemCoalJetpack.java b/src/main/java/com/darkona/adventurebackpack/item/ItemCoalJetpack.java
index 1b8f39b0..023e151e 100644
--- a/src/main/java/com/darkona/adventurebackpack/item/ItemCoalJetpack.java
+++ b/src/main/java/com/darkona/adventurebackpack/item/ItemCoalJetpack.java
@@ -32,6 +32,7 @@
 import com.darkona.adventurebackpack.network.messages.EntityParticlePacket;
 import com.darkona.adventurebackpack.network.messages.EntitySoundPacket;
 import com.darkona.adventurebackpack.proxy.ClientProxy;
+import com.darkona.adventurebackpack.reference.GeneralReference;
 import com.darkona.adventurebackpack.util.BackpackUtils;
 import com.darkona.adventurebackpack.util.Resources;
 import com.darkona.adventurebackpack.util.TipUtils;
@@ -188,7 +189,7 @@ private void runBoiler(InventoryCoalJetpack inv, World world, EntityPlayer playe
             if (inv.getSteamTank().getFluidAmount() < inv.getSteamTank().getCapacity()) {
                 if (inv.getWaterTank().getFluid() != null) {
                     int steam = inv.getWaterTank().drain((temperature / 100), true).amount;
-                    inv.getSteamTank().fill(new FluidStack(FluidRegistry.getFluid("steam"), steam * 4), true);
+                    inv.getSteamTank().fill(new FluidStack(GeneralReference.getSteamFluid(), steam * 4), true);
                     inv.dirtyTanks();
                 }
             }
diff --git a/src/main/java/com/darkona/adventurebackpack/reference/GeneralReference.java b/src/main/java/com/darkona/adventurebackpack/reference/GeneralReference.java
index 973db154..40a6866a 100644
--- a/src/main/java/com/darkona/adventurebackpack/reference/GeneralReference.java
+++ b/src/main/java/com/darkona/adventurebackpack/reference/GeneralReference.java
@@ -9,6 +9,7 @@
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 
 import com.darkona.adventurebackpack.config.ConfigHandler;
@@ -102,4 +103,18 @@ public static boolean isValidFuel(String fluidName) {
     public static Float getFuelRate(String fluidName) {
         return liquidFuels.get(fluidName);
     }
+
+    private static Fluid steam;
+
+    public static Fluid getSteamFluid() {
+        if (steam != null) {
+            return steam;
+        }
+        // prefer actual steam over water
+        steam = FluidRegistry.getFluid("steam");
+        if (steam == null) {
+            steam = FluidRegistry.getFluid("water");
+        }
+        return steam;
+    }
 }