diff --git a/core/src/main/antlr/hql-sql.g b/core/src/main/antlr/hql-sql.g
index 8bb359be50..a86564ae8c 100644
--- a/core/src/main/antlr/hql-sql.g
+++ b/core/src/main/antlr/hql-sql.g
@@ -582,8 +582,10 @@ collectionFunction
 	;
 
 functionCall
-	: #(METHOD_CALL  {inFunctionCall=true;} pathAsIdent ( #(EXPR_LIST (expr)* ) )? )
-		{ processFunction(#functionCall,inSelect); } {inFunctionCall=false;}
+	: #(METHOD_CALL  {inFunctionCall=true;} pathAsIdent ( #(EXPR_LIST (exprOrSubquery)* ) )? ) {
+        processFunction( #functionCall, inSelect );
+        inFunctionCall=false;
+    }
 	| #(AGGREGATE aggregateExpr )
 	;