diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 2ad3f39195d..9b504e4bed2 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4652,6 +4652,18 @@ var __param = this.__param || function(index, decorator) { return function (targ
                 let aliasedModuleNames: string[] = [];
                 let unaliasedModuleNames: string[] = [];
                 let importAliasNames: string[] = [];
+
+                // Fill in amd-dependency tags
+                for (let amdDependency of node.amdDependencies) {
+                    if (amdDependency.name) {
+                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                        importAliasNames.push(amdDependency.name);
+                    }
+                    else {
+                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
+                    }
+                }
+
                 for (let importNode of externalImports) {
                     // Find the name of the external module
                     let externalModuleName = "";
@@ -4678,17 +4690,6 @@ var __param = this.__param || function(index, decorator) { return function (targ
                         unaliasedModuleNames.push(externalModuleName);
                     }
                 }
-
-                // Fill in amd-dependency tags
-                for (let amdDependency of node.amdDependencies) {
-                    if (amdDependency.name) {
-                        aliasedModuleNames.push("\"" + amdDependency.path + "\"");
-                        importAliasNames.push(amdDependency.name);
-                    }
-                    else {
-                        unaliasedModuleNames.push("\"" + amdDependency.path + "\"");
-                    }
-                }
                 
                 writeLine();
                 write("define(");
diff --git a/tests/baselines/reference/amdDependencyCommentName2.js b/tests/baselines/reference/amdDependencyCommentName2.js
index 4f54c548580..6f9f1f268e8 100644
--- a/tests/baselines/reference/amdDependencyCommentName2.js
+++ b/tests/baselines/reference/amdDependencyCommentName2.js
@@ -6,6 +6,6 @@ m1.f();
 
 //// [amdDependencyCommentName2.js]
 ///<amd-dependency path='bar' name='b'/>
-define(["require", "exports", "m2", "bar"], function (require, exports, m1, b) {
+define(["require", "exports", "bar", "m2"], function (require, exports, b, m1) {
     m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName3.js b/tests/baselines/reference/amdDependencyCommentName3.js
index ca6b1280585..2b74dc23aed 100644
--- a/tests/baselines/reference/amdDependencyCommentName3.js
+++ b/tests/baselines/reference/amdDependencyCommentName3.js
@@ -10,6 +10,6 @@ m1.f();
 ///<amd-dependency path='bar' name='b'/>
 ///<amd-dependency path='foo'/>
 ///<amd-dependency path='goo' name='c'/>
-define(["require", "exports", "m2", "bar", "goo", "foo"], function (require, exports, m1, b, c) {
+define(["require", "exports", "bar", "goo", "m2", "foo"], function (require, exports, b, c, m1) {
     m1.f();
 });
diff --git a/tests/baselines/reference/amdDependencyCommentName4.js b/tests/baselines/reference/amdDependencyCommentName4.js
index 04f40140702..93cdf2399aa 100644
--- a/tests/baselines/reference/amdDependencyCommentName4.js
+++ b/tests/baselines/reference/amdDependencyCommentName4.js
@@ -25,7 +25,7 @@ import "unaliasedModule2";
 ///<amd-dependency path='unaliasedModule3'/>
 ///<amd-dependency path='aliasedModule6' name='n2'/>
 ///<amd-dependency path='unaliasedModule4'/>
-define(["require", "exports", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "aliasedModule5", "aliasedModule6", "unaliasedModule1", "unaliasedModule2", "unaliasedModule3", "unaliasedModule4"], function (require, exports, r1, aliasedModule2_1, aliasedModule3_1, ns, n1, n2) {
+define(["require", "exports", "aliasedModule5", "aliasedModule6", "aliasedModule1", "aliasedModule2", "aliasedModule3", "aliasedModule4", "unaliasedModule3", "unaliasedModule4", "unaliasedModule1", "unaliasedModule2"], function (require, exports, n1, n2, r1, aliasedModule2_1, aliasedModule3_1, ns) {
     r1;
     aliasedModule2_1.p1;
     aliasedModule3_1.default;