diff --git a/node_modules/vfs-local/localfs.js b/node_modules/vfs-local/localfs.js
index 8c9bc249..7a6dc53b 100644
--- a/node_modules/vfs-local/localfs.js
+++ b/node_modules/vfs-local/localfs.js
@@ -1611,7 +1611,7 @@ module.exports = function setup(fsOptions) {
         if (options.capturePane) {
             options = options.capturePane;
             args = [
-                "-C",
+                // "-C",
                 "-u2", // force utf and 256 color
                 "-L", tmuxName,
                 "capture-pane", options.joinLines !== false ? "-peJ" : "-pe",
diff --git a/plugins/c9.ide.terminal/predict_echo_test.js b/plugins/c9.ide.terminal/predict_echo_test.js
index 80be08fe..b3f1e36d 100644
--- a/plugins/c9.ide.terminal/predict_echo_test.js
+++ b/plugins/c9.ide.terminal/predict_echo_test.js
@@ -134,9 +134,7 @@ require(["lib/architect/architect", "lib/chai/chai", "/vfs-root", "ace/test/asse
                     session = editor.ace.getSession().c9session;
                     send = session.send;
 
-                    if (peek(-2) === "$") // maybe there already was a prompt
-                        return init();
-                    afterPrompt(function() { setTimeout(init); });
+                    setTimeout(init);
                     
                     function init() {
                         afterPrompt(function() { setTimeout(start); });
diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js
index 29cbc884..f1cf0408 100644
--- a/plugins/c9.ide.terminal/terminal.js
+++ b/plugins/c9.ide.terminal/terminal.js
@@ -668,6 +668,7 @@ define(function(require, exports, module) {
                 var queue = "";
                 var warned = false;
                 var timer = null;
+                var initialConnect = true;
 
                 function send(data) {
                     if (!(c9.status & c9.NETWORK))
@@ -680,7 +681,7 @@ define(function(require, exports, module) {
                         timer = setTimeout(function() {
                             timer = null;
                             if (!session.connected)
-                                return warnConnection();
+                                return initialConnect || warnConnection();
                             // Send data to stdin of tmux process
                             session.pty.write(queue);
                             queue = "";
@@ -746,6 +747,11 @@ define(function(require, exports, module) {
                                 tab: session.tab 
                             });
                             loadHistory(session);
+                            initialConnect = false;
+                            if (queue) {
+                                session.pty.write(queue);
+                                queue = "";
+                            }
                         }
                     });
                 });