diff --git a/ssc/cmod_battery_eqns.cpp b/ssc/cmod_battery_eqns.cpp
index 435c173df..1fc012c3d 100644
--- a/ssc/cmod_battery_eqns.cpp
+++ b/ssc/cmod_battery_eqns.cpp
@@ -265,12 +265,12 @@ bool Reopt_size_standalone_battery_params(ssc_data_t data) {
     reopt_settings.assign("solver_name", var_data("SCIP")); // "HiGHS" option does not work with large numbers like 1e38 for tier max values per https://github.com/NREL/SAM/issues/1742
 
     // assign the reopt parameter table and log messages
+    reopt_table->assign_match_case("Settings", reopt_settings);
     reopt_electric.assign_match_case("urdb_response", reopt_utility);
     reopt_table->assign_match_case("ElectricTariff", reopt_electric);
     reopt_table->assign_match_case("ElectricLoad", reopt_load);
     reopt_table->assign_match_case("Financial", reopt_fin);
     reopt_table->assign_match_case("ElectricStorage", reopt_batt);
-    reopt_table->assign_match_case("Settings", reopt_settings);
     vt->assign_match_case("reopt_scenario", reopt_params);
     vt->assign_match_case("log", log);
     return true;
diff --git a/ssc/cmod_pvsamv1_eqns.cpp b/ssc/cmod_pvsamv1_eqns.cpp
index c9f84a52d..1bd543db3 100644
--- a/ssc/cmod_pvsamv1_eqns.cpp
+++ b/ssc/cmod_pvsamv1_eqns.cpp
@@ -38,10 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "vartab.h"
 
 SSCEXPORT bool Reopt_size_battery_params(ssc_data_t data) {
-    auto vt = static_cast<var_table*>(data);
-    if (!vt) {
-        return false;
-    }
+//    auto vt = static_cast<var_table*>(data);
+//    if (!vt) {
+//        return false;
+//    }
     var_table reopt_site, reopt_pv, reopt_utility;
 
     bool result = Reopt_size_standalone_battery_params(data);
@@ -50,6 +50,11 @@ SSCEXPORT bool Reopt_size_battery_params(ssc_data_t data) {
         return result;
     }
 
+    auto vt = static_cast<var_table*>(data);
+    if (!vt) {
+        return false;
+    }
+
     bool size_for_grid_outage = false;
     if (vt->is_assigned("size_for_grid_outage")) {
         size_for_grid_outage = vt->as_boolean("size_for_grid_outage");