diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
index ce72dc0c1eb8..398dd9e06b30 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
@@ -64,7 +64,6 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP
           PsiMethod from = getMethodToTakeParametersFrom(container, candidate.first, candidate.second);
           if (from != null) {
             result.addElement(createParametersLookupElement(from, methodCall, candidate.first));
-            return;
           }
         }
       }
@@ -75,7 +74,8 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP
   }
 
   private static LookupElement createParametersLookupElement(PsiMethod takeParametersFrom, PsiElement call, PsiMethod invoked) {
-    final String lookupString = StringUtil.join(takeParametersFrom.getParameterList().getParameters(), new Function<PsiParameter, String>() {
+    PsiParameter[] parameters = takeParametersFrom.getParameterList().getParameters();
+    final String lookupString = StringUtil.join(parameters, new Function<PsiParameter, String>() {
       public String fun(PsiParameter psiParameter) {
         return psiParameter.getName();
       }
diff --git a/java/java-tests/testData/codeInsight/completion/normal/SameSignature.java b/java/java-tests/testData/codeInsight/completion/normal/SameSignature.java
index a2ca02f04dfa..5a7f86d78d23 100644
--- a/java/java-tests/testData/codeInsight/completion/normal/SameSignature.java
+++ b/java/java-tests/testData/codeInsight/completion/normal/SameSignature.java
@@ -2,8 +2,10 @@ import java.io.File;
 
 class Zoo {
   private Zoo delegate;
-  @Override
+
   public void foo(String s, File file) {
+  }
+  public void foo(String s, File file, int a) {
     delegate.foo(s<caret>);
   }
 }
diff --git a/java/java-tests/testData/codeInsight/completion/normal/SameSignature_after.java b/java/java-tests/testData/codeInsight/completion/normal/SameSignature_after.java
index 57788a97801e..287c9fe2b3d5 100644
--- a/java/java-tests/testData/codeInsight/completion/normal/SameSignature_after.java
+++ b/java/java-tests/testData/codeInsight/completion/normal/SameSignature_after.java
@@ -2,8 +2,10 @@ import java.io.File;
 
 class Zoo {
   private Zoo delegate;
-  @Override
+
   public void foo(String s, File file) {
-    delegate.foo(s, file);<caret>
+  }
+  public void foo(String s, File file, int a) {
+    delegate.foo(s, file, a);<caret>
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index 0ba44f53b878..5272c49a0e1b 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -1306,7 +1306,8 @@ public class ListUtils {
 
   public void testSameSignature() {
     configure()
-    lookup.setCurrentItem(myItems[1])
+    myFixture.assertPreferredCompletionItems(0, 's', 's, file', 's, file, a')
+    lookup.setCurrentItem(lookup.items[2])
     myFixture.type('\n')
     checkResult()
   }