diff --git a/core/src/main/java/org/opensearch/sql/analysis/NestedAnalyzer.java b/core/src/main/java/org/opensearch/sql/analysis/NestedAnalyzer.java
index de03dcf190..f050824557 100644
--- a/core/src/main/java/org/opensearch/sql/analysis/NestedAnalyzer.java
+++ b/core/src/main/java/org/opensearch/sql/analysis/NestedAnalyzer.java
@@ -50,11 +50,7 @@ public LogicalPlan visitAlias(Alias node, AnalysisContext context) {
   public LogicalPlan visitNestedAllTupleFields(NestedAllTupleFields node, AnalysisContext context) {
     List<Map<String, ReferenceExpression>> args = new ArrayList<>();
     for (NamedExpression namedExpr : namedExpressions) {
-
-      if (namedExpr.getDelegated() instanceof FunctionExpression
-          && ((FunctionExpression) namedExpr.getDelegated()).getFunctionName()
-          .getFunctionName().equalsIgnoreCase(BuiltinFunctionName.NESTED.name())) {
-
+      if (isNestedFunction(namedExpr.getDelegated())) {
         ReferenceExpression field =
             (ReferenceExpression) ((FunctionExpression) namedExpr.getDelegated())
                 .getArguments().get(0);