diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java
index e9039f5565f2..28f1f9d8252d 100644
--- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java
+++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java
@@ -34,6 +34,7 @@ public class PyEduPluginConfigurator implements EduPluginConfigurator {
   public static final String PYTHON_2 = "2.x";
   private static final String TESTS_PY = "tests.py";
   private static final Logger LOG = Logger.getInstance(PyEduPluginConfigurator.class);
+  private static final String COURSE_NAME = "Introduction to Python.zip";
 
   @NotNull
   @Override
@@ -133,13 +134,14 @@ public class PyEduPluginConfigurator implements EduPluginConfigurator {
   @Override
   public List<String> getBundledCoursePaths() {
     @NonNls String jarPath = PathUtil.getJarPathForClass(PyEduPluginConfigurator.class);
+
     if (jarPath.endsWith(".jar")) {
       final File jarFile = new File(jarPath);
 
       File pluginBaseDir = jarFile.getParentFile();
-      return Collections.singletonList(new File(new File(pluginBaseDir, "courses"), "Introduction to Python.zip").getPath());
+      return Collections.singletonList(new File(new File(pluginBaseDir, "courses"), COURSE_NAME).getPath());
     }
 
-    return Collections.singletonList(new File(new File(jarPath, "courses"), "Introduction to Python.zip").getPath());
+    return Collections.singletonList(new File(new File(jarPath, "courses"), COURSE_NAME).getPath());
   }
 }
diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
index 6da31fbebbe9..d2564a08b358 100644
--- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
+++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.jetbrains.edu.learning.EduPluginConfigurator;
+import com.jetbrains.edu.learning.PyEduPluginConfigurator;
 import com.jetbrains.edu.learning.PyStudyDirectoryProjectGenerator;
 import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
@@ -65,7 +66,7 @@ public class PyStudyIntroductionCourseAction extends AnAction {
     }
     else {
       final PyStudyDirectoryProjectGenerator generator = new PyStudyDirectoryProjectGenerator(true);
-      final EduPluginConfigurator configurator = EduPluginConfigurator.INSTANCE.forLanguage(PythonLanguage.getInstance());
+      final EduPluginConfigurator configurator = new PyEduPluginConfigurator();
       final String bundledCoursePath = configurator.getBundledCoursePaths().get(0);
       Course introCourse = StudyProjectGenerator.getCourse(bundledCoursePath);
       if (introCourse == null) {