diff --git a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
index a446d6c43e1..efe5626d80e 100644
--- a/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
@@ -299,10 +299,11 @@ public class JetExpressionParsing extends AbstractJetParsing {
                 advance(); // operation
                 expression.done(POSTFIX_EXPRESSION);
             } else if (parseCallWithClosure()) {
+                while (parseCallWithClosure());
                 expression.done(CALL_EXPRESSION);
             } else if (at(LPAR)) {
                 parseValueArgumentList();
-                parseCallWithClosure();
+                while (parseCallWithClosure());
                 expression.done(CALL_EXPRESSION);
             } else if (at(LT)) {
                 // TODO: be (even) more clever
diff --git a/idea/testData/psi/CallWithManyClosures.jet b/idea/testData/psi/CallWithManyClosures.jet
new file mode 100644
index 00000000000..9731b09b8f9
--- /dev/null
+++ b/idea/testData/psi/CallWithManyClosures.jet
@@ -0,0 +1,6 @@
+val a = f() {} {} {}
+val a = f {} {} {}
+val a = f {}
+val a = f() {}
+val a = (f) {} {} {}
+val a = (f)() {} {} {}
\ No newline at end of file
diff --git a/idea/testData/psi/CallWithManyClosures.txt b/idea/testData/psi/CallWithManyClosures.txt
new file mode 100644
index 00000000000..4148265a4e9
--- /dev/null
+++ b/idea/testData/psi/CallWithManyClosures.txt
@@ -0,0 +1,166 @@
+JetFile: CallWithManyClosures.jet
+  NAMESPACE
+    PROPERTY
+      PsiElement(val)('val')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('a')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      CALL_EXPRESSION
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('f')
+        VALUE_ARGUMENT_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n')
+    PROPERTY
+      PsiElement(val)('val')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('a')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      CALL_EXPRESSION
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('f')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n')
+    PROPERTY
+      PsiElement(val)('val')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('a')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      CALL_EXPRESSION
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('f')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n')
+    PROPERTY
+      PsiElement(val)('val')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('a')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      CALL_EXPRESSION
+        REFERENCE_EXPRESSION
+          PsiElement(IDENTIFIER)('f')
+        VALUE_ARGUMENT_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n')
+    PROPERTY
+      PsiElement(val)('val')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('a')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      CALL_EXPRESSION
+        PARENTHESIZED
+          PsiElement(LPAR)('(')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('f')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+    PsiWhiteSpace('\n')
+    PROPERTY
+      PsiElement(val)('val')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('a')
+      PsiWhiteSpace(' ')
+      PsiElement(EQ)('=')
+      PsiWhiteSpace(' ')
+      CALL_EXPRESSION
+        PARENTHESIZED
+          PsiElement(LPAR)('(')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('f')
+          PsiElement(RPAR)(')')
+        VALUE_ARGUMENT_LIST
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace(' ')
+        FUNCTION_LITERAL
+          PsiElement(LBRACE)('{')
+          BODY
+            <empty list>
+          PsiElement(RBRACE)('}')
\ No newline at end of file