diff --git a/sc2/src/uqm/globdata.c b/sc2/src/uqm/globdata.c
index 9d806de3a..4bf14f8da 100644
--- a/sc2/src/uqm/globdata.c
+++ b/sc2/src/uqm/globdata.c
@@ -372,9 +372,9 @@ InitGameStructures (void)
 
 	const int equipment[]=
 	{
+		FUEL_TANK,
 		HIGHEFF_FUELSYS,
-		HIGHEFF_FUELSYS,
-		HIGHEFF_FUELSYS,
+		SHIVA_FURNACE,
 
 		DYNAMO_UNIT,
 		DYNAMO_UNIT,
@@ -398,7 +398,7 @@ InitGameStructures (void)
 	(void) ck_;
 
 	GLOBAL_SIS( CrewEnlisted )= 0;
-	GLOBAL_SIS( FuelOnBoard )= 10;
+	GLOBAL_SIS( FuelOnBoard )= 10 * FUEL_TANK_SCALE;
 	for( int i= 0; i < 16; ++i )
 	{
 		const int module= equipment[ i ];
@@ -410,11 +410,11 @@ InitGameStructures (void)
 		}
 		else if( module == FUEL_TANK )
 		{
-			GLOBAL_SIS( FuelOnBoard )+= FUEL_TANK_CAPACITY * FUEL_TANK_SCALE;
+			GLOBAL_SIS( FuelOnBoard )+= FUEL_TANK_CAPACITY;
 		}
 		else if( module == HIGHEFF_FUELSYS )
 		{
-			GLOBAL_SIS( FuelOnBoard )+= HEFUEL_TANK_CAPACITY * FUEL_TANK_SCALE;
+			GLOBAL_SIS( FuelOnBoard )+= HEFUEL_TANK_CAPACITY;
 		}
 	}