diff --git a/python/src/com/jetbrains/python/psi/impl/PyParameterListImpl.java b/python/src/com/jetbrains/python/psi/impl/PyParameterListImpl.java
index 13fa9b8e5f40..5d9bf5eaff85 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyParameterListImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyParameterListImpl.java
@@ -115,6 +115,9 @@ public class PyParameterListImpl extends PyBaseElementImpl<PyParameterListStub>
         if (nextParameter.isKeywordContainer() || nextParameter.isPositionalContainer()) {
           ++i;
         }
+        if (nextParameter.isKeywordContainer() && j<anotherParametersLength && anotherParameters[j] instanceof PyNamedParameter) {
+          j++;
+        }
       }
     }
 
@@ -124,6 +127,9 @@ public class PyParameterListImpl extends PyBaseElementImpl<PyParameterListStub>
         if (nextParameter.isKeywordContainer() || nextParameter.isPositionalContainer()) {
           ++j;
         }
+        if (nextParameter.isKeywordContainer() && i<parametersLength && parameters[i] instanceof PyNamedParameter) {
+          i++;
+        }
       }
     }
     return (i >= parametersLength) && (j >= anotherParametersLength);