diff --git a/src/validator/test/YieldValidatorTest.cpp b/src/validator/test/YieldValidatorTest.cpp
index 68775e43624ebfd5e017cf5a8928fb7b11fd5f63..4036448bd58d056e2c0b323a1ddf8257122e7bcc 100644
--- a/src/validator/test/YieldValidatorTest.cpp
+++ b/src/validator/test/YieldValidatorTest.cpp
@@ -464,7 +464,7 @@ TEST_F(YieldValidatorTest, Error) {
         auto query = var + "YIELD like.start";
         auto result = checkResult(query);
         EXPECT_EQ(std::string(result.message()),
-                  "SemanticError: Not supported expression `like.start' for props deduction.");
+                  "SemanticError: Invalid label identifiers: like");
     }
 }
 
diff --git a/src/visitor/FindVisitor.inl b/src/visitor/FindVisitor.inl
index bb8217c0bf8445b64885d5614de4ed686469053b..d5fda21aaeeb7efd586ee60cfb6722559635c099 100644
--- a/src/visitor/FindVisitor.inl
+++ b/src/visitor/FindVisitor.inl
@@ -210,6 +210,10 @@ void FindVisitor<T>::visit(LabelExpression* expr) {
 template <typename T>
 void FindVisitor<T>::visit(LabelAttributeExpression *expr) {
     findInCurrentExpr(expr);
+    if (!needFindAll_ && found_) return;
+    expr->left()->accept(this);
+    if (!needFindAll_ && found_) return;
+    expr->right()->accept(this);
 }
 
 template <typename T>
diff --git a/tests/tck/features/go/GO.IntVid.feature b/tests/tck/features/go/GO.IntVid.feature
index 341c9e026bb27db2116cbc925ab66de2690df994..87847f398cb32c78cf619374baf288d53625a22c 100644
--- a/tests/tck/features/go/GO.IntVid.feature
+++ b/tests/tck/features/go/GO.IntVid.feature
@@ -348,7 +348,7 @@ Feature: IntegerVid Go  Sentence
       """
       YIELD serve.start_year, like.likeness, serve._type, like._type
       """
-    Then a SemanticError should be raised at runtime: Not supported expression `serve.start_year' for props deduction.
+    Then a SemanticError should be raised at runtime: Invalid label identifiers: serve
     When executing query:
       """
       GO FROM hash("Russell Westbrook") OVER serve, like REVERSELY
diff --git a/tests/tck/features/go/GO.feature b/tests/tck/features/go/GO.feature
index dd1ed529740cb9741dd36d6faeaf595a6f369db9..ede7c04e9d1abde4b096aa93d9705d2cc74824a4 100644
--- a/tests/tck/features/go/GO.feature
+++ b/tests/tck/features/go/GO.feature
@@ -371,7 +371,7 @@ Feature: Go Sentence
       """
       YIELD serve.start_year, like.likeness, serve._type, like._type
       """
-    Then a SemanticError should be raised at runtime: Not supported expression `serve.start_year' for props deduction.
+    Then a SemanticError should be raised at runtime: Invalid label identifiers: serve
     When executing query:
       """
       GO FROM "Russell Westbrook" OVER serve, like REVERSELY
diff --git a/tests/tck/features/yield/yield.IntVid.feature b/tests/tck/features/yield/yield.IntVid.feature
index 348b3d46a41bc1255a0aa00a3123618f7ae5fac3..207a235df15eff2847c2f45f3e46318e8d8cd4ef 100644
--- a/tests/tck/features/yield/yield.IntVid.feature
+++ b/tests/tck/features/yield/yield.IntVid.feature
@@ -308,7 +308,7 @@ Feature: Yield Sentence
       """
       $var = GO FROM hash("Boris Diaw") OVER serve YIELD $^.player.name AS name, serve.start_year AS start, $$.team.name AS team;YIELD a.team
       """
-    Then a SemanticError should be raised at runtime: Not supported expression `a.team' for props deduction.
+    Then a SemanticError should be raised at runtime: Invalid label identifiers: a
     When executing query:
       """
       $var = GO FROM hash("Boris Diaw") OVER like YIELD $-.abc
diff --git a/tests/tck/features/yield/yield.feature b/tests/tck/features/yield/yield.feature
index ec5986310cdf8683cf259e3d12684ec4b513b61c..eb2ae1040bad2b72ca8994c169a4e08cc3fc1822 100644
--- a/tests/tck/features/yield/yield.feature
+++ b/tests/tck/features/yield/yield.feature
@@ -308,7 +308,7 @@ Feature: Yield Sentence
       """
       $var = GO FROM "Boris Diaw" OVER serve YIELD $^.player.name AS name, serve.start_year AS start, $$.team.name AS team;YIELD a.team
       """
-    Then a SemanticError should be raised at runtime: Not supported expression `a.team' for props deduction.
+    Then a SemanticError should be raised at runtime: Invalid label identifiers: a
     When executing query:
       """
       $var = GO FROM "Boris Diaw" OVER like YIELD $-.abc