diff --git a/seed/script-generator.c b/seed/script-generator.c
index 9c9f819..6bad518 100644
--- a/seed/script-generator.c
+++ b/seed/script-generator.c
@@ -451,8 +451,9 @@ FILE *start_script(int id, int bash_build) {
 			if (bash_build != 1) {
 				fputs("set -E\ntrap 'env PS1=\"[TRAP] \\w # \" bash -i' ERR\n", out);
 			} else {
-				fputs("set -E\ntrap 'bash -c '\"'\"'while true; do printf \""
-				"[TRAP - use Ctrl+D] $(pwd) # \"; $(cat); done'\"'\"'' ERR\n",
+				/* FIXME early bash has buggy ERR trap handling */
+				fputs("set -e\ntrap 'bash -c '\"'\"'while true; do printf \""
+				"[TRAP - use Ctrl+D] $(pwd) # \"; eval \"$(cat)\"; done'\"'\"'' EXIT\n",
 				out);
 			}
 		} else {
diff --git a/steps/improve/open_console.sh b/steps/improve/open_console.sh
index 33cc402..4af4e78 100644
--- a/steps/improve/open_console.sh
+++ b/steps/improve/open_console.sh
@@ -7,5 +7,5 @@
 if bash --version | grep -q 'GPLv3'; then
     env - PATH=${PREFIX}/bin PS1="\w # " openvt -- bash -i
 else
-    bash -c 'while true; do printf "[early Bash - use Ctrl+D] $(pwd) # "; $(cat /dev/tty2); done' &> /dev/tty2 &
+    bash -c 'while true; do printf "[early Bash - use Ctrl+D] $(pwd) # "; eval "$(cat /dev/tty2)"; done' &> /dev/tty2 &
 fi