diff --git a/CHANGELOG.md b/CHANGELOG.md
index d20398da7..104068be4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### C# -> VB
 
+* Improve snippet detection [#825](https://github.com/icsharpcode/CodeConverter/issues/825)
 
 ## [8.4.5] - 2022-01-26
 
diff --git a/CodeConverter/VB/CSToVBConversion.cs b/CodeConverter/VB/CSToVBConversion.cs
index 6bedb556d..736653fe7 100644
--- a/CodeConverter/VB/CSToVBConversion.cs
+++ b/CodeConverter/VB/CSToVBConversion.cs
@@ -162,7 +162,8 @@ node is CSSyntax.StatementSyntax ||
         public bool MustBeContainedByClass(SyntaxNode node)
         {
             return node is CSSyntax.BaseMethodDeclarationSyntax || node is CSSyntax.BaseFieldDeclarationSyntax ||
-                   node is CSSyntax.BasePropertyDeclarationSyntax;
+                   node is CSSyntax.BasePropertyDeclarationSyntax ||
+                   node is CSSyntax.GlobalStatementSyntax; //https://github.com/icsharpcode/CodeConverter/issues/825
         }
 
         private static bool ParsedAsFieldButCouldBeLocalVariableDeclaration(SyntaxNode node)