diff --git a/src/rSW_Control.c b/src/rSW_Control.c
index 5455e22c..94d67224 100644
--- a/src/rSW_Control.c
+++ b/src/rSW_Control.c
@@ -136,28 +136,28 @@ void rSW_CTL_obtain_inputs(Bool from_files, SEXP InputData, SEXP weatherList, LO
         return; // Exit function prematurely due to error
     }
 
-    onSet_SW_SIT_transp(GET_SLOT(InputData, install("site")), LogInfo);
+    onSet_SW_SOILS(GET_SLOT(InputData, install("soils")), LogInfo);
     #ifdef RSWDEBUG
-    if (debug) sw_printf(" > 'swrc/ptf-type'");
+    if (debug) sw_printf(" > 'soils' + 'swrc parameters'");
     #endif
     if (LogInfo->stopRun) {
         return; // Exit function prematurely due to error
     }
 
-    if (isNull(weatherList)) {
-      weatherList = GET_SLOT(InputData, install("weatherHistory"));
-    }
-    onSet_WTH_DATA(weatherList, LogInfo);
+    onSet_SW_SIT_transp(GET_SLOT(InputData, install("site")), LogInfo);
     #ifdef RSWDEBUG
-    if (debug) sw_printf(" > 'weather-history'");
+    if (debug) sw_printf(" > 'tr-regions'");
     #endif
     if (LogInfo->stopRun) {
         return; // Exit function prematurely due to error
     }
 
-    onSet_SW_SOILS(GET_SLOT(InputData, install("soils")), LogInfo);
+    if (isNull(weatherList)) {
+      weatherList = GET_SLOT(InputData, install("weatherHistory"));
+    }
+    onSet_WTH_DATA(weatherList, LogInfo);
     #ifdef RSWDEBUG
-    if (debug) sw_printf(" > 'soils' + 'swrc parameters'");
+    if (debug) sw_printf(" > 'weather-history'");
     #endif
     if (LogInfo->stopRun) {
         return; // Exit function prematurely due to error