diff --git a/src/common/parser/DcsParser.ts b/src/common/parser/DcsParser.ts
index 8b934942..f501fe25 100644
--- a/src/common/parser/DcsParser.ts
+++ b/src/common/parser/DcsParser.ts
@@ -84,7 +84,7 @@ export class DcsParser implements IDcsParser {
     } else {
       let j = this._active.length - 1;
       for (; j >= 0; j--) {
-        if (this._active[j].unhook(success) !== false) {
+        if (this._active[j].unhook(success)) {
           break;
         }
       }
diff --git a/src/common/parser/EscapeSequenceParser.ts b/src/common/parser/EscapeSequenceParser.ts
index 3ffcd2d5..065cd1d9 100644
--- a/src/common/parser/EscapeSequenceParser.ts
+++ b/src/common/parser/EscapeSequenceParser.ts
@@ -521,8 +521,8 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
           const handlers = this._csiHandlers[collect << 8 | code];
           let j = handlers ? handlers.length - 1 : -1;
           for (; j >= 0; j--) {
-            // undefined or true means success and to stop bubbling
-            if (handlers[j](params) !== false) {
+            // true means success and to stop bubbling
+            if (handlers[j](params)) {
               break;
             }
           }
@@ -555,8 +555,8 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
           const handlersEsc = this._escHandlers[collect << 8 | code];
           let jj = handlersEsc ? handlersEsc.length - 1 : -1;
           for (; jj >= 0; jj--) {
-            // undefined or true means success and to stop bubbling
-            if (handlersEsc[jj]() !== false) {
+            // true means success and to stop bubbling
+            if (handlersEsc[jj]()) {
               break;
             }
           }
@@ -582,6 +582,21 @@ export class EscapeSequenceParser extends Disposable implements IEscapeSequenceP
               i = j - 1;
               break;
             }
+            if (++j >= length || (code = data[j]) === 0x18 || code === 0x1a || code === 0x1b || (code > 0x7f && code < NON_ASCII_PRINTABLE)) {
+              dcs.put(data, i, j);
+              i = j - 1;
+              break;
+            }
+            if (++j >= length || (code = data[j]) === 0x18 || code === 0x1a || code === 0x1b || (code > 0x7f && code < NON_ASCII_PRINTABLE)) {
+              dcs.put(data, i, j);
+              i = j - 1;
+              break;
+            }
+            if (++j >= length || (code = data[j]) === 0x18 || code === 0x1a || code === 0x1b || (code > 0x7f && code < NON_ASCII_PRINTABLE)) {
+              dcs.put(data, i, j);
+              i = j - 1;
+              break;
+            }
           }
           break;
         case ParserAction.DCS_UNHOOK:
diff --git a/src/common/parser/OscParser.ts b/src/common/parser/OscParser.ts
index 3a9ae19a..ff5e7074 100644
--- a/src/common/parser/OscParser.ts
+++ b/src/common/parser/OscParser.ts
@@ -83,7 +83,7 @@ export class OscParser implements IOscParser {
     } else {
       let j = handlers.length - 1;
       for (; j >= 0; j--) {
-        if (handlers[j].end(success) !== false) {
+        if (handlers[j].end(success)) {
           break;
         }
       }