diff --git a/src/compiler/printer.ts b/src/compiler/printer.ts
index eb1bb2a6581..14c08eeab45 100644
--- a/src/compiler/printer.ts
+++ b/src/compiler/printer.ts
@@ -1987,7 +1987,7 @@ const _super = (function (geti, seti) {
                 if (substitution && (getNodeEmitFlags(node) & NodeEmitFlags.NoSubstitution) === 0) {
                     const substitute = substitution(node);
                     if (substitute !== node) {
-                        setNodeEmitFlags(substitute, NodeEmitFlags.NoSubstitution);
+                        setNodeEmitFlags(substitute, NodeEmitFlags.NoSubstitution | getNodeEmitFlags(substitute));
                         emitWorker(substitute);
                         return true;
                     }
diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
index ebc50ad7b16..983d33ba73e 100644
--- a/src/compiler/transformers/es6.ts
+++ b/src/compiler/transformers/es6.ts
@@ -203,7 +203,7 @@ namespace ts {
         /**
          * Visits a ClassDeclaration and transforms it into a variable statement.
          *
-         * @parma node A ClassDeclaration node.
+         * @param node A ClassDeclaration node.
          */
         function visitClassDeclaration(node: ClassDeclaration): Statement {
             // [source]