diff --git a/NETGenerator/NETGenerator.cs b/NETGenerator/NETGenerator.cs
index 7f483b7d2..1772faf0e 100644
--- a/NETGenerator/NETGenerator.cs
+++ b/NETGenerator/NETGenerator.cs
@@ -5655,7 +5655,10 @@ namespace PascalABCCompiler.NETGenerator
         public override void visit(IGotoStatementNode value)
         {
             Label lab = helper.GetLabel(value.label, il);
-            il.Emit(OpCodes.Br, lab);
+            if (safe_block)
+                il.Emit(OpCodes.Leave, lab);
+            else
+                il.Emit(OpCodes.Br, lab);
         }
 
         private Stack<Label> if_stack = new Stack<Label>();
diff --git a/TestSuite/goto1.pas b/TestSuite/goto1.pas
new file mode 100644
index 000000000..5c664588a
--- /dev/null
+++ b/TestSuite/goto1.pas
@@ -0,0 +1,10 @@
+label c1;
+begin
+  var s := 0;
+  foreach var i in range(0, 2) do
+  begin
+    goto c1;
+    s := 2;
+  end;  
+  c1: assert(s=0);
+end.
\ No newline at end of file