diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
index 2623a035f96d..e76e96db7377 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
@@ -291,14 +291,9 @@ public class ProjectTypeStep extends ModuleWizardStep implements Disposable {
     return groups;
   }
 
-  private ModuleType getModuleType(TemplatesGroup group) {
-    Collection<ProjectTemplate> templates = myTemplatesMap.get(group);
-    if (templates.isEmpty()) {
-      return null;
-    }
-    ProjectTemplate template = templates.iterator().next();
-    ModuleBuilder builder = myBuilders.get(template);
-    return builder.getModuleType();
+  private static ModuleType getModuleType(TemplatesGroup group) {
+    ModuleBuilder moduleBuilder = group.getModuleBuilder();
+    return moduleBuilder == null ? null : moduleBuilder.getModuleType();
   }
 
   // new TemplatesGroup selected