diff --git a/python/helpers/pycharm/pycharm_load_entry_point.py b/python/helpers/pycharm/pycharm_load_entry_point.py
index f03286c79f04..ecf4f905080f 100644
--- a/python/helpers/pycharm/pycharm_load_entry_point.py
+++ b/python/helpers/pycharm/pycharm_load_entry_point.py
@@ -1,9 +1,9 @@
-import sys
+import os, sys
 from pkg_resources import load_entry_point
 
 if __name__ == '__main__':
-  name = sys.argv.pop()
-  dist = sys.argv.pop()
+  dist = os.environ.get("PYCHARM_EP_DIST")
+  name = os.environ.get("PYCHARM_EP_NAME")
   sys.exit(
     load_entry_point(dist, "console_scripts", name)()
   )
diff --git a/python/python-rest/src/com/jetbrains/rest/sphinx/SphinxBaseCommand.java b/python/python-rest/src/com/jetbrains/rest/sphinx/SphinxBaseCommand.java
index ee0d0e522e60..21b9e44521b9 100644
--- a/python/python-rest/src/com/jetbrains/rest/sphinx/SphinxBaseCommand.java
+++ b/python/python-rest/src/com/jetbrains/rest/sphinx/SphinxBaseCommand.java
@@ -165,11 +165,12 @@ public class SphinxBaseCommand {
         script_params.addParameter(p);
       }
     }
-    cmd.addParameters("Sphinx", "sphinx-quickstart");
 
     cmd.setPassParentEnvironment(true);
     setPythonIOEncoding(cmd.getEnvironment(), "utf-8");
     setPythonUnbuffered(cmd.getEnvironment());
+    cmd.getEnvironment().put("PYCHARM_EP_DIST", "Sphinx");
+    cmd.getEnvironment().put("PYCHARM_EP_NAME", "sphinx-quickstart");
 
     List<String> pathList = Lists.newArrayList(PythonCommandLineState.getAddedPaths(sdk));
     pathList.addAll(PythonCommandLineState.collectPythonPath(module));