diff --git a/legend-engine-xts-mastery/legend-engine-xt-mastery-grammar/src/main/java/org/finos/legend/engine/language/pure/dsl/mastery/grammar/from/MasteryParseTreeWalker.java b/legend-engine-xts-mastery/legend-engine-xt-mastery-grammar/src/main/java/org/finos/legend/engine/language/pure/dsl/mastery/grammar/from/MasteryParseTreeWalker.java
index 9fad84905db..594ddc98acd 100644
--- a/legend-engine-xts-mastery/legend-engine-xt-mastery-grammar/src/main/java/org/finos/legend/engine/language/pure/dsl/mastery/grammar/from/MasteryParseTreeWalker.java
+++ b/legend-engine-xts-mastery/legend-engine-xt-mastery-grammar/src/main/java/org/finos/legend/engine/language/pure/dsl/mastery/grammar/from/MasteryParseTreeWalker.java
@@ -378,13 +378,13 @@ private Lambda visitLambdaWithFilter(String propertyName, MasteryParserGrammar.C
         String inputFilter = ctx.getText().replaceAll(DOLLAR_SIGN, INPUT);
         return domainParser.parseLambda(
                 format(PRECEDENCE_LAMBDA_WITH_FILTER, propertyName, inputFilter),
-                "", 0, 0, true);
+                "", 0, 0, walkerSourceInformation.getReturnSourceInfo());
     }
 
     private Lambda visitLambdaWithoutFilter(String propertyName)
     {
         return domainParser.parseLambda(format(SIMPLE_PRECEDENCE_LAMBDA, propertyName),
-                "", 0, 0, true);
+                "", 0, 0, walkerSourceInformation.getReturnSourceInfo());
     }
 
     private RuleScope visitRuleScopeWithoutPrecedence(MasteryParserGrammar.ScopeContext ctx, Set<String> uniqueScopes,PrecedenceRule precedenceRule)
@@ -748,7 +748,7 @@ private List<Lambda> visitQueryExpressions(MasteryParserGrammar.QueryExpressions
 
     private Lambda visitLambda(MasteryParserGrammar.LambdaFunctionContext ctx)
     {
-        return domainParser.parseLambda(ctx.getText(), "", 0, 0, true);
+        return domainParser.parseLambda(ctx.getText(), "", 0, 0, walkerSourceInformation.getReturnSourceInfo());
     }
 
     private ResolutionKeyType visitResolutionKeyType(MasteryParserGrammar.ResolutionQueryKeyTypeContext ctx)