diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend
index 4612b5375..9a57897a6 100644
--- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend
+++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.xtend
@@ -589,7 +589,7 @@ class XtextGeneratorTemplates {
 					}
 				}
 				
-				protected Module getRuntimeModule(String grammar) {
+				protected «Module» getRuntimeModule(String grammar) {
 					«FOR lang : langConfigs»
 						if («lang.grammar.name.toUpperCase.replaceAll('\\.', '_')».equals(grammar)) {
 							return new «getRuntimeModule(lang.grammar)»();
diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java
index 603b19e5d..3a9049161 100644
--- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java
+++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/XtextGeneratorTemplates.java
@@ -1791,8 +1791,10 @@ public class XtextGeneratorTemplates {
         _builder.append("\t");
         _builder.newLine();
         _builder.append("\t");
-        _builder.append("protected Module getRuntimeModule(String grammar) {");
-        _builder.newLine();
+        _builder.append("protected ");
+        _builder.append(Module.class, "\t");
+        _builder.append(" getRuntimeModule(String grammar) {");
+        _builder.newLineIfNotEmpty();
         {
           for(final IXtextGeneratorLanguage lang_1 : langConfigs) {
             _builder.append("\t\t");