diff --git a/src/behave/behaveUnits.cpp b/src/behave/behaveUnits.cpp
index 53524ea..c652a3c 100644
--- a/src/behave/behaveUnits.cpp
+++ b/src/behave/behaveUnits.cpp
@@ -548,10 +548,10 @@ double PressureUnits::fromBaseUnits(double value, PressureUnitsEnum units) {
 double SurfaceAreaToVolumeUnits::toBaseUnits(double value, SurfaceAreaToVolumeUnitsEnum units)
 {
     if (value == 0.0) return 0.0;
-    const double SQUARE_METERS_OVER_CUBIC_METERS_TO_SQUARE_FEET_OVER_CUBIC_FEET = 3.280839895013123;
+    const double SQUARE_METERS_OVER_CUBIC_METERS_TO_SQUARE_FEET_OVER_CUBIC_FEET = 0.3048;
 
-    const double SQUARE_INCHES_OVER_CUBIC_INCHES_TO_SQUARE_FEET_OVER_CUBIC_FEET = 0.083333333333333;
-    const double SQUARE_CENTIMETERS_OVER_CUBIC_CENTIMERS_TO_SQUARE_FEET_OVER_CUBIC_FEET = 0.03280839895013123;
+    const double SQUARE_INCHES_OVER_CUBIC_INCHES_TO_SQUARE_FEET_OVER_CUBIC_FEET = 12;
+    const double SQUARE_CENTIMETERS_OVER_CUBIC_CENTIMERS_TO_SQUARE_FEET_OVER_CUBIC_FEET = 30.48;
 
     switch (units)
     {
@@ -586,9 +586,9 @@ double SurfaceAreaToVolumeUnits::toBaseUnits(double value, SurfaceAreaToVolumeUn
 double SurfaceAreaToVolumeUnits::fromBaseUnits(double value, SurfaceAreaToVolumeUnitsEnum units)
 {
     if (value == 0.0) return 0.0;
-    const double SQUARE_FEET_OVER_CUBIC_FEET_TO_SQUARE_METERS_OVER_CUBIC_METERS = 0.3048;
-    const double SQUARE_FEET_OVER_CUBIC_FEET_TO_SQUARE_INCHES_OVER_CUBIC_INCHES = 12;
-    const double SQUARE_FEET_OVER_CUBIC_FEET_TO_SQUARE_CENTIMETERS_OVER_CUBIC_CENTIMERS = 30.48;
+    const double SQUARE_FEET_OVER_CUBIC_FEET_TO_SQUARE_METERS_OVER_CUBIC_METERS = 3.280839895013123;
+    const double SQUARE_FEET_OVER_CUBIC_FEET_TO_SQUARE_INCHES_OVER_CUBIC_INCHES = 0.083333333333333;
+    const double SQUARE_FEET_OVER_CUBIC_FEET_TO_SQUARE_CENTIMETERS_OVER_CUBIC_CENTIMERS = 0.03280839895013123;
 
     switch (units)
     {
diff --git a/src/behave/fuelModels.cpp b/src/behave/fuelModels.cpp
index 995a659..5018ed8 100644
--- a/src/behave/fuelModels.cpp
+++ b/src/behave/fuelModels.cpp
@@ -721,6 +721,12 @@ bool FuelModels::setCustomFuelModel(int fuelModelNumber, std::string code, std::
 
     moistureOfExtinctionDead = FractionUnits::toBaseUnits(moistureOfExtinctionDead, moistureUnits);
 
+    if (heatOfCombustionUnits != HeatOfCombustionUnits::BtusPerPound)
+    {
+        heatOfCombustionDead = HeatOfCombustionUnits::toBaseUnits(heatOfCombustionDead, heatOfCombustionUnits);
+        heatOfCombustionLive = HeatOfCombustionUnits::toBaseUnits(heatOfCombustionLive, heatOfCombustionUnits);
+    }
+
     if (loadingUnits != LoadingUnits::PoundsPerSquareFoot)
     {
         fuelLoadOneHour = LoadingUnits::toBaseUnits(fuelLoadOneHour, loadingUnits);