diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt
index efa1987df..c70c4aea8 100755
--- a/src/universal/bin/sbt
+++ b/src/universal/bin/sbt
@@ -56,6 +56,8 @@ cygwinpath() {
   fi
 }
 
+
+echo "Loading $(dirname "$(realpath "$0")")/sbt-launch-lib.bash"
 . "$(dirname "$(realpath "$0")")/sbt-launch-lib.bash"
 
 
diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash
index 0c1b4d509..265e87431 100755
--- a/src/universal/bin/sbt-launch-lib.bash
+++ b/src/universal/bin/sbt-launch-lib.bash
@@ -56,7 +56,9 @@ execRunner () {
     echo ""
   }
 
-  exec "$@"
+  # THis used to be exec, but we loose the ability to re-hook stty then
+  # for cygwin...  Maybe we should flag the feature here...
+  "$@"
 }
 
 addJava () {
@@ -182,12 +184,12 @@ run() {
   execRunner "$java_cmd" \
     ${SBT_OPTS:-$default_sbt_opts} \
     $(get_mem_opts $sbt_mem) \
-    ${java_opts} \
+  	  ${java_opts} \
     ${java_args[@]} \
     -jar "$sbt_jar" \
     "${sbt_commands[@]}" \
-    "${residual_args[@]}"
-    
+    "${residual_args[@]}"  
+  
   exit_code=$?
 
   # Clean up the terminal from cygwin hacks.