diff --git a/python/helpers/pycharm/pycharm_run_utils.py b/python/helpers/pycharm/pycharm_run_utils.py
index 5fbc35cc1582..2153980a3efb 100644
--- a/python/helpers/pycharm/pycharm_run_utils.py
+++ b/python/helpers/pycharm/pycharm_run_utils.py
@@ -32,6 +32,9 @@ def getModuleName(prefix, cnt):
   return prefix + "%" + str(cnt)
 
 def insert_to_sys_path(script_path):
+  print(script_path)
+  for s in sys.path:
+      print(s)
   while script_path in sys.path:
     sys.path.remove(script_path)
   sys.path.insert(0, script_path)
diff --git a/python/helpers/pydev/pydev_monkey.py b/python/helpers/pydev/pydev_monkey.py
index 56b64d248794..4770f10939eb 100644
--- a/python/helpers/pydev/pydev_monkey.py
+++ b/python/helpers/pydev/pydev_monkey.py
@@ -27,12 +27,17 @@ def patch_args(args):
             return args
 
         if is_python(args[0]):
-            if '-c' == args[1]:
+            try:
+                indC = args.index('-c')
+            except KeyError:
+                indC = -1
+
+            if indC != -1:
                 import pydevd
                 host, port = pydevd.dispatch()
 
                 if port is not None:
-                    args[2] = "import sys; sys.path.append('%s'); import pydevd; pydevd.settrace(host='%s', port=%s, suspend=False); %s"%(helpers, host, port, args[2])
+                    args[indC + 1] = "import sys; sys.path.append('%s'); import pydevd; pydevd.settrace(host='%s', port=%s, suspend=False); %s"%(helpers, host, port, args[indC + 1])
                     return args
             else:
                 new_args.append(args[0])