diff --git a/SqlScriptDom/Parser/TSql/TSql100.g b/SqlScriptDom/Parser/TSql/TSql100.g
index c0cbb0e..4c481db 100644
--- a/SqlScriptDom/Parser/TSql/TSql100.g
+++ b/SqlScriptDom/Parser/TSql/TSql100.g
@@ -15503,10 +15503,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }            
         (Comma vOption = xmlParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql110.g b/SqlScriptDom/Parser/TSql/TSql110.g
index 508e6b7..eb56e16 100644
--- a/SqlScriptDom/Parser/TSql/TSql110.g
+++ b/SqlScriptDom/Parser/TSql/TSql110.g
@@ -17718,10 +17718,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }            
         (Comma vOption = xmlParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql120.g b/SqlScriptDom/Parser/TSql/TSql120.g
index 78126da..558c8ec 100644
--- a/SqlScriptDom/Parser/TSql/TSql120.g
+++ b/SqlScriptDom/Parser/TSql/TSql120.g
@@ -18221,10 +18221,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }            
         (Comma vOption = xmlParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql130.g b/SqlScriptDom/Parser/TSql/TSql130.g
index a299def..65ef7ba 100644
--- a/SqlScriptDom/Parser/TSql/TSql130.g
+++ b/SqlScriptDom/Parser/TSql/TSql130.g
@@ -19957,10 +19957,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = xmlParam[encountered]
@@ -20047,10 +20050,13 @@ jsonForClause returns [JsonForClause vResult = FragmentFactory.CreateFragment<Js
 {
     JsonForClauseOption vOption;
     JsonForClauseOptions encountered = JsonForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tJson:Identifier vOption = jsonForClauseMode
         {
             Match(tJson, CodeGenerationSupporter.Json);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = jsonParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql140.g b/SqlScriptDom/Parser/TSql/TSql140.g
index 1311d88..a8a2e98 100644
--- a/SqlScriptDom/Parser/TSql/TSql140.g
+++ b/SqlScriptDom/Parser/TSql/TSql140.g
@@ -20546,10 +20546,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = xmlParam[encountered]
@@ -20636,10 +20639,13 @@ jsonForClause returns [JsonForClause vResult = FragmentFactory.CreateFragment<Js
 {
     JsonForClauseOption vOption;
     JsonForClauseOptions encountered = JsonForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tJson:Identifier vOption = jsonForClauseMode
         {
             Match(tJson, CodeGenerationSupporter.Json);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = jsonParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql150.g b/SqlScriptDom/Parser/TSql/TSql150.g
index 555902c..d1b8dfc 100644
--- a/SqlScriptDom/Parser/TSql/TSql150.g
+++ b/SqlScriptDom/Parser/TSql/TSql150.g
@@ -21296,10 +21296,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = xmlParam[encountered]
@@ -21386,10 +21389,13 @@ jsonForClause returns [JsonForClause vResult = FragmentFactory.CreateFragment<Js
 {
     JsonForClauseOption vOption;
     JsonForClauseOptions encountered = JsonForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tJson:Identifier vOption = jsonForClauseMode
         {
             Match(tJson, CodeGenerationSupporter.Json);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = jsonParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql160.g b/SqlScriptDom/Parser/TSql/TSql160.g
index 913e2a0..9de5e5b 100644
--- a/SqlScriptDom/Parser/TSql/TSql160.g
+++ b/SqlScriptDom/Parser/TSql/TSql160.g
@@ -21520,10 +21520,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = xmlParam[encountered]
@@ -21610,10 +21613,13 @@ jsonForClause returns [JsonForClause vResult = FragmentFactory.CreateFragment<Js
 {
     JsonForClauseOption vOption;
     JsonForClauseOptions encountered = JsonForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tJson:Identifier vOption = jsonForClauseMode
         {
             Match(tJson, CodeGenerationSupporter.Json);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = jsonParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql170.g b/SqlScriptDom/Parser/TSql/TSql170.g
index 367fc11..37f8f87 100644
--- a/SqlScriptDom/Parser/TSql/TSql170.g
+++ b/SqlScriptDom/Parser/TSql/TSql170.g
@@ -21520,10 +21520,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = xmlParam[encountered]
@@ -21610,10 +21613,13 @@ jsonForClause returns [JsonForClause vResult = FragmentFactory.CreateFragment<Js
 {
     JsonForClauseOption vOption;
     JsonForClauseOptions encountered = JsonForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tJson:Identifier vOption = jsonForClauseMode
         {
             Match(tJson, CodeGenerationSupporter.Json);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }
         (Comma vOption = jsonParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql80.g b/SqlScriptDom/Parser/TSql/TSql80.g
index b97ddc0..b120ab6 100644
--- a/SqlScriptDom/Parser/TSql/TSql80.g
+++ b/SqlScriptDom/Parser/TSql/TSql80.g
@@ -6167,10 +6167,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }            
         (Comma vOption = xmlParam[encountered]
diff --git a/SqlScriptDom/Parser/TSql/TSql90.g b/SqlScriptDom/Parser/TSql/TSql90.g
index 77f27a1..83e2d09 100644
--- a/SqlScriptDom/Parser/TSql/TSql90.g
+++ b/SqlScriptDom/Parser/TSql/TSql90.g
@@ -12572,10 +12572,13 @@ xmlForClause returns [XmlForClause vResult = FragmentFactory.CreateFragment<XmlF
 {
     XmlForClauseOption vOption;
     XmlForClauseOptions encountered = XmlForClauseOptions.None;
+    int forTokenIndex = GetLastTokenIndex();  // Store the index of the FOR token before matching the next token
 }
     : tXml:Identifier vOption = xmlForClauseMode
         {
             Match(tXml, CodeGenerationSupporter.Xml);
+            // Explicitly set the FirstTokenIndex to the FOR token
+            UpdateTokenInfo(vResult, forTokenIndex, forTokenIndex);
             AddAndUpdateTokenInfo(vResult, vResult.Options, vOption);
         }            
         (Comma vOption = xmlParam[encountered]
diff --git a/Test/SqlDom/TestScripts/ForClauseInSubqueryTests.sql b/Test/SqlDom/TestScripts/ForClauseInSubqueryTests.sql
new file mode 100644
index 0000000..7349270
--- /dev/null
+++ b/Test/SqlDom/TestScripts/ForClauseInSubqueryTests.sql
@@ -0,0 +1,17 @@
+-- FOR XML in subquery tests
+SELECT *
+FROM dbo.foo
+FOR XML PATH(''), ROOT ('x'), TYPE;
+
+SET @x = (SELECT *
+    FROM dbo.foo
+    FOR XML PATH(''), ROOT ('x'), TYPE);
+
+-- FOR JSON in subquery tests
+SELECT *
+FROM dbo.foo
+FOR JSON PATH, ROOT ('x');
+
+SET @x = (SELECT *
+    FROM dbo.foo
+    FOR JSON PATH, ROOT ('x'));
\ No newline at end of file