diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
index 6bffbe3b299..955a10ee931 100644
--- a/src/compiler/transformers/es2015.ts
+++ b/src/compiler/transformers/es2015.ts
@@ -870,7 +870,7 @@ namespace ts {
                 transformConstructorBody(constructor, node, extendsClauseElement, hasSynthesizedSuper)
             );
 
-            setTextRange(constructorFunction, constructor || node);
+            setTextRange(setOriginalNode(constructorFunction, constructor), constructor || node);
             if (extendsClauseElement) {
                 setEmitFlags(constructorFunction, EmitFlags.CapturesThis);
             }
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 0ef7db06272..e67663d9e9c 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -2178,13 +2178,16 @@ namespace ts {
                     return undefined;
                 }
 
-                return setTextRange(
-                    createExpressionStatement(
-                        inlineExpressions(
-                            map(variables, transformInitializedVariable)
-                        )
+                return setOriginalNode(
+                    setTextRange(
+                        createExpressionStatement(
+                            inlineExpressions(
+                                map(variables, transformInitializedVariable)
+                            )
+                        ),
+                        node
                     ),
-                    node
+                    node,
                 );
             }
             else {