diff --git a/Tools/jsbsim_bridge b/Tools/jsbsim_bridge
index a14e6cc27f..7df4fd965e 160000
--- a/Tools/jsbsim_bridge
+++ b/Tools/jsbsim_bridge
@@ -1 +1 @@
-Subproject commit a14e6cc27f26f926b9bf5550ddefc29394a2af84
+Subproject commit 7df4fd965e9f20b41f6aeff6ead21e8066de7440
diff --git a/Tools/setup_jsbsim.bash b/Tools/setup_jsbsim.bash
index e780477d36..6e437fd868 100755
--- a/Tools/setup_jsbsim.bash
+++ b/Tools/setup_jsbsim.bash
@@ -19,15 +19,12 @@ export FG_AIRCRAFT="${SRC_DIR}/Tools/jsbsim_bridge/models"
 # Need more architectural discussions to make this more scalable
 case "$MODEL" in
         rascal)
-            AIRCRAFT_DIR="Rascal"
             MODEL_NAME="Rascal110-JSBSim"
             ;;
         quadrotor_x)
-            AIRCRAFT_DIR="quadrotor_x"
             MODEL_NAME="quadrotor_x"
             ;;
         hexarotor_x)
-            AIRCRAFT_DIR="hexarotor_x"
             MODEL_NAME="hexarotor_x"
             ;;
         *)
@@ -36,5 +33,4 @@ case "$MODEL" in
 
 esac
 
-export JSBSIM_AIRCRAFT_DIR="$AIRCRAFT_DIR"
 export JSBSIM_AIRCRAFT_MODEL="$MODEL_NAME"
diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh
index 300ab0f093..465f6a48e9 100755
--- a/Tools/sitl_run.sh
+++ b/Tools/sitl_run.sh
@@ -57,10 +57,11 @@ if [ "$program" == "jmavsim" ]; then
 fi
 
 if [ "$model" == "" ] || [ "$model" == "none" ]; then
-	echo "empty model, setting iris as default"
 	if [ "$program" == "jsbsim" ]; then
+		echo "empty model, setting rascal as default for jsbsim"
 		model="rascal"
 	else
+		echo "empty model, setting iris as default"
 		model="iris"
 	fi
 fi
@@ -163,7 +164,7 @@ elif [ "$program" == "jsbsim" ] && [ -z "$no_sim" ]; then
 			--disable-ai-models &> /dev/null &
 		FGFS_PID=$!
 	fi
-	"${build_path}/build_jsbsim_bridge/jsbsim_bridge" "models/${JSBSIM_AIRCRAFT_DIR}" $JSBSIM_AIRCRAFT_MODEL ${model} "${src_path}/Tools/jsbsim_bridge/scene/${world}.xml" $HEADLESS 2> /dev/null &
+	"${build_path}/build_jsbsim_bridge/jsbsim_bridge" ${model} -s "${src_path}/Tools/jsbsim_bridge/scene/${world}.xml" 2> /dev/null &
 	JSBSIM_PID=$!
 fi