diff --git a/Moose Setup/Eclipse/Moose Loader Static.launch b/Moose Setup/Eclipse/Moose Loader Static.launch
index 20723f471..4ee25e04a 100644
--- a/Moose Setup/Eclipse/Moose Loader Static.launch	
+++ b/Moose Setup/Eclipse/Moose Loader Static.launch	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\ProgramData\chocolatey\lib\lua51\tools\lua5.1.exe"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="&quot;Moose Setup\Moose_Create.lua&quot; &quot;S&quot; &quot;LOCAL&quot; &quot;${resource_loc:/MOOSE/Moose Development/Moose}&quot; &quot;${resource_loc:/MOOSE/Moose Setup}&quot;&#13;&#10;${resource_loc:/MOOSE_INCLUDE/Moose_Include_Static}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/MOOSE}"/>
 </launchConfiguration>
diff --git a/Moose Setup/Moose_Create.lua b/Moose Setup/Moose_Create.lua
index 7d507b269..42a3213aa 100644
--- a/Moose Setup/Moose_Create.lua	
+++ b/Moose Setup/Moose_Create.lua	
@@ -40,11 +40,10 @@ LoaderFile:write( MooseLoaderText )
 local MooseSourcesFile = io.open( MooseModulesFilePath, "r" )
 local MooseSource = MooseSourcesFile:read("*l")
 
-_, _, MooseSource = string.find( MooseSource, "Scripts/Moose/(.+)'" )
-
 while( MooseSource ) do
   
   if MooseSource ~= "" then
+    MooseSource = string.match( MooseSource, "Scripts/Moose/(.+)'" )
     local MooseFilePath = MooseDevelopmentPath .. "/" .. MooseSource
     if MooseDynamicStatic == "D" then
       print( "Load dynamic: " .. MooseFilePath )
@@ -60,7 +59,6 @@ while( MooseSource ) do
   end
   
   MooseSource = MooseSourcesFile:read("*l")
-  _, _, MooseSource = string.find( MooseSource, "Scripts/Moose/(.+)'" )
 end
 
 if MooseDynamicStatic == "D" then