diff --git a/connect.py b/connect.py
index ae6b7c212..603f57f60 100755
--- a/connect.py
+++ b/connect.py
@@ -384,9 +384,6 @@ class SshTty(Tty):
                 if self.channel in r:
                     try:
                         x = self.channel.recv(10240)
-                        print x
-                        print '===='
-                        print len(x)
                         if len(x) == 0:
                             break
                         if self.vim_flag:
diff --git a/run_server.py b/run_server.py
index 42d5bb3e6..e46c941a3 100755
--- a/run_server.py
+++ b/run_server.py
@@ -412,7 +412,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                     if self.term.vim_flag:
                         self.term.vim_data += recv
                     try:
-                        self.write_message(json.dumps({'data': data}))
+                        self.write_message(data)
                         now_timestamp = time.time()
                         self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))
                         self.log_file_f.write(data)
diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 3e576b4f8..0767affd8 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -85,7 +85,11 @@ function openTerminal(options) {
         term.write('Connection Reset By Peer');
     };
     sock.onmessage= function (data) {
-         term.write(JSON.parse(data.data)['data']);
+        try {
+            term.write(data)
+        } catch (e) {
+            term.write(JSON.parse(data.data)['data'])
+        }
     };
     sock.onerror= function () {
         term.write('Connection Reset By Peer');