diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b21d1475..484c77b3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,7 @@ All notable changes to this project will be documented in this file.
 - AS1/2 ActionStringExtract incorrectly decompiled as String.substr instead of substring global function
 - [#2516] AS1/2 Renaming of identifiers not setting function length correctly
 - AS1/2 Renaming of identifiers must not rename integer array offsets
+- [#2517] Loop break detection problems in some cases
 
  ### Changed
 - Icon of "Deobfuscation options" menu from pile of pills to medkit
@@ -3985,6 +3986,7 @@ Major version of SWF to XML export changed to 2.
 [#2511]: https://www.free-decompiler.com/flash/issues/2511
 [#2515]: https://www.free-decompiler.com/flash/issues/2515
 [#2516]: https://www.free-decompiler.com/flash/issues/2516
+[#2517]: https://www.free-decompiler.com/flash/issues/2517
 [#2476]: https://www.free-decompiler.com/flash/issues/2476
 [#2404]: https://www.free-decompiler.com/flash/issues/2404
 [#1418]: https://www.free-decompiler.com/flash/issues/1418
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
index 4320541e9..fb1c29516 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
@@ -2656,6 +2656,7 @@ public class Graph {
                 currentLoop = null;
                 if (isLoop) {
                     currentLoop = new Loop(loops.size(), part, null);
+                    currentLoop.stopParts = stopPart == null ? new ArrayList<>() : stopPart;
                     currentLoop.phase = 1;
                     loops.add(currentLoop);
                 }
@@ -2803,6 +2804,29 @@ public class Graph {
 
                 }
 
+                
+                //When some of breakcandidates pass through current stoppart,
+                //Remove other candidantes.
+                if (!currentLoop.stopParts.isEmpty()) {
+                    List<Integer> bcsLeft = new ArrayList<>();
+                    for (int c = 0; c < currentLoop.breakCandidates.size(); c++) {
+                        GraphPart cand = currentLoop.breakCandidates.get(c);
+                        GraphPart sp = currentLoop.stopParts.get(currentLoop.stopParts.size() - 1);
+                        if (cand == sp || cand.leadsTo(localData, this, code, sp, new ArrayList<>() /*ingore existing loop states*/, throwStates, false /* ?? */)) {
+                            bcsLeft.add(c);
+                        }
+                    }
+                    
+                    if (!bcsLeft.isEmpty()) {
+                         for (int c = currentLoop.breakCandidates.size() - 1; c >= 0; c--) {
+                             if (!bcsLeft.contains(c)) {
+                                 currentLoop.breakCandidates.remove(c);
+                                 currentLoop.breakCandidatesLevels.remove(c);
+                             }
+                         }
+                    }
+                }
+                
                 do {
                     found = null;
 
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java
index 8849bccc2..72110c98f 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Loop.java
@@ -87,6 +87,11 @@ public class Loop implements Serializable {
      * Break candidates are locked
      */
     public int breakCandidatesLocked = 0;
+    
+    /**
+     * Stop parts before entering the loop
+     */
+    public List<GraphPart> stopParts = new ArrayList<>();
 
     /**
      * Constructs a loop
diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java
index d56500334..37f0a898b 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java
@@ -2562,5 +2562,51 @@ public class ActionScript2Test extends ActionScript2TestBase {
                 + "}\r\n"
         );
     }
+
+    @Test
+    public void frame95_breakDetectionTest() {
+        compareSrc(95, "function myFunction(item)\r\n"
+                + "{\r\n"
+                + "var _loc2_;\r\n"
+                + "var _loc4_;\r\n"
+                + "if(!isNaN(item))\r\n"
+                + "{\r\n"
+                + "_loc2_ = [1,2,3];\r\n"
+                + "for(var _loc3_ in _loc2_)\r\n"
+                + "{\r\n"
+                + "switch(_loc3_)\r\n"
+                + "{\r\n"
+                + "case \"A\":\r\n"
+                + "if(item == \"a\")\r\n"
+                + "{\r\n"
+                + "return true;\r\n"
+                + "}\r\n"
+                + "case \"B\":\r\n"
+                + "if(item == \"b\")\r\n"
+                + "{\r\n"
+                + "return true;\r\n"
+                + "}\r\n"
+                + "case \"C\":\r\n"
+                + "if(item == \"c\")\r\n"
+                + "{\r\n"
+                + "return true;\r\n"
+                + "}\r\n"
+                + "case \"D\":\r\n"
+                + "if(item == \"d\")\r\n"
+                + "{\r\n"
+                + "return true;\r\n"
+                + "}\r\n"
+                + "}\r\n"
+                + "}\r\n"
+                + "}\r\n"
+                + "else\r\n"
+                + "{\r\n"
+                + "trace(\"item is nan\");\r\n"
+                + "}\r\n"
+                + "return false;\r\n"
+                + "}\r\n"
+                + "trace(\"breakDetectionTest\");\r\n"
+        );
+    }
     //--FRAMES-END--
 }
diff --git a/libsrc/ffdec_lib/testdata/as2/as2.swf b/libsrc/ffdec_lib/testdata/as2/as2.swf
index 6006adea4..7cba80eef 100644
Binary files a/libsrc/ffdec_lib/testdata/as2/as2.swf and b/libsrc/ffdec_lib/testdata/as2/as2.swf differ
diff --git a/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml b/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml
index d47205626..3175ac93c 100644
--- a/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml
+++ b/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml
@@ -31,9 +31,9 @@
           <Include href="Tween 5.xml" itemIcon="1" loadImmediate="false" itemID="60429674-00000289" lastModified="1753122968"/>
      </symbols>
      <timelines>
-          <DOMTimeline name="Scene 1" currentFrame="18">
+          <DOMTimeline name="Scene 1" currentFrame="94">
                <layers>
-                    <DOMLayer name="Layer 17" color="#4FFF4F" current="true" isSelected="true">
+                    <DOMLayer name="Layer 17" color="#4FFF4F">
                          <frames>
                               <DOMFrame index="0" duration="12" keyMode="9728">
                                    <elements/>
@@ -771,9 +771,9 @@
                                                        </fills>
                                                        <edges>
                                                             <Edge fillStyle0="1" fillStyle1="2" edges="
-!3156 7501[3091 7490 3054 7490!3054 7490[3050 7494 3050 7457!3050 7457[3050 7441 3159 7239!3159 7239[3270 7033 3327 6947!3327 6947[3353 6908 3412 6794!3412 6794[3470 6682 3500 6639!3500 6639[3602 6491 3649 6692!3649 6692|3713 6670!3713
- 6670[3760 6655 3782 6655!3782 6655[3942 6655 3985 6781!3985 6781[4007 6844 3996 6914!3996 6914[3996 6948 3999 6995!3999 6995[4000 7031 3993 7054!3993 7054[3976 7106 3860 7224!3860 7224[3847 7237 3741 7292!3741 7292[3638 7346 3616 7372
-!3616 7372[3594 7396 3511 7442!3511 7442[3435 7483 3427 7483!3427 7483[3409 7483 3407 7468!3407 7468[3405 7453 3386 7453!3386 7453[3361 7468 3330 7483!3330 7483[3270 7512 3235 7512!3235 7512[3220 7512 3156 7501"/>
+!3054 7490[3050 7494 3050 7457!3050 7457[3050 7441 3159 7239!3159 7239[3270 7033 3327 6947!3327 6947[3353 6908 3412 6794!3412 6794[3470 6682 3500 6639!3500 6639[3602 6491 3649 6692!3649 6692|3713 6670!3713 6670[3760 6655 3782 6655!3782
+ 6655[3942 6655 3985 6781!3985 6781[4007 6844 3996 6914!3996 6914[3996 6948 3999 6995!3999 6995[4000 7031 3993 7054!3993 7054[3976 7106 3860 7224!3860 7224[3847 7237 3741 7292!3741 7292[3638 7346 3616 7372!3616 7372[3594 7396 3511 7442
+!3511 7442[3435 7483 3427 7483!3427 7483[3409 7483 3407 7468!3407 7468[3405 7453 3386 7453!3386 7453[3361 7468 3330 7483!3330 7483[3270 7512 3235 7512!3235 7512[3220 7512 3156 7501!3156 7501[3091 7490 3054 7490"/>
                                                             <Edge fillStyle1="1" edges="
 !2675 7305[2675 6953 2924 6704!2924 6704[3174 6454 3525 6454!3525 6454[3622 6454 3711 6474!3711 6474[3733 6454 3765 6434!3765 6434[3806 6409 3930 6340!3930 6340[4062 6261 4196 6152!4196 6152[4256 6104 4311 6071!4311 6071[4428 5999 4520
  6000!4520 6000[4595 5999 4654 6049!4654 6049[4666 6059 4677 6071!4677 6071[4717 6116 4741 6186!4741 6186[4765 6256 4765 6315!4765 6315[4765 6361 4719 6443!4719 6443[4667 6534 4584 6614!4584 6614[4420 6774 4222 6815!4222 6815[4376 7028
@@ -1019,7 +1019,7 @@
                               </DOMFrame>
                          </frames>
                     </DOMLayer>
-                    <DOMLayer name="Layer 1" color="#4FFF4F">
+                    <DOMLayer name="Layer 1" color="#4FFF4F" current="true" isSelected="true">
                          <frames>
                               <DOMFrame index="0" duration="22" keyMode="9728">
                                    <elements/>
@@ -3478,6 +3478,53 @@ switch(test)
    case 3:
       trace("B");
 }
+]]></script>
+                                   </Actionscript>
+                                   <elements/>
+                              </DOMFrame>
+                              <DOMFrame index="94" keyMode="9728">
+                                   <Actionscript>
+                                        <script><![CDATA[trace("breakDetectionTest");
+function myFunction(item)
+{
+   var _loc2_;
+   var _loc3_;
+   if(!isNaN(item))
+   {
+      _loc2_ = [1,2,3];
+      for(var _loc4_ in _loc2_)
+      {
+         switch(_loc4_)
+         {
+            case "A":
+               if(item == "a")
+               {
+                  return true;
+               }
+            case "B":
+               if(item == "b")
+               {
+                  return true;
+               }
+            case "C":
+               if(item == "c")
+               {
+                  return true;
+               }
+            case "D":
+               if(item == "d")
+               {
+                  return true;
+               }
+         }
+      }
+   }
+   else
+   {
+      trace("item is nan");
+   }
+   return false;
+}
 ]]></script>
                                    </Actionscript>
                                    <elements/>
diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml
index cea1a482b..72532e16b 100644
--- a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml
+++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml
@@ -37,30 +37,27 @@
                     </StrokeStyle>
                   </strokes>
                   <edges>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!7000 0|7000 1000!7000 1000|8000 1000"/>
-                    <Edge fillStyle0="1" strokeStyle="1" edges="!8000 1000|8000 0"/>
                     <Edge fillStyle0="1" edges="!8000 0|7000 0"/>
-                    <Edge fillStyle0="2" fillStyle1="3" strokeStyle="1" edges="!7000 4000|7000 3000!7000 3000|8000 3000"/>
-                    <Edge fillStyle0="2" strokeStyle="1" edges="!8000 3000|8000 1000"/>
+                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!7000 0|7000 1000!7000 1000|8000 1000"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="!8000 1000|8000 3000"/>
+                    <Edge fillStyle0="3" fillStyle1="2" strokeStyle="1" edges="!8000 3000|7000 3000!7000 3000|7000 4000"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="!7000 4000|1000 4000"/>
+                    <Edge fillStyle0="5" fillStyle1="2" strokeStyle="1" edges="!1000 4000|1000 3000!1000 3000|0 3000"/>
+                    <Edge fillStyle0="5" strokeStyle="1" edges="!0 3000|0 4000!0 4000|1000 4000"/>
+                    <Edge fillStyle0="1" strokeStyle="1" edges="!8000 1000|8000 0"/>
                     <Edge fillStyle1="3" strokeStyle="1" edges="!8000 3000|8000 4000!8000 4000|7000 4000"/>
                     <Edge fillStyle0="2" fillStyle1="6" strokeStyle="1" edges="!4000 3000[2757 3000 1878 2707!1878 2707[1000 2414 1000 2000!1000 2000[1000 1586 1878 1293!1878 1293[2757 1000 4000 1000!4000 1000[5243 1000 6121 1293!6121 1293[7000 1586 7000 2000!7000 2000[7000 2414 6121 2707!6121 2707[5243 3000 4000
  3000"/>
+                    <Edge fillStyle1="4" strokeStyle="1" edges="
+!0 1000|0 0"/>
                     <Edge fillStyle1="4" edges="
 !0 0|1000 0"/>
+                    <Edge fillStyle1="2" strokeStyle="1" edges="
+!1000 0|7000 0"/>
                     <Edge fillStyle0="2" fillStyle1="4" strokeStyle="1" edges="
 !1000 0|1000 1000!1000 1000|0 1000"/>
                     <Edge fillStyle0="2" strokeStyle="1" edges="
 !0 1000|0 3000"/>
-                    <Edge fillStyle0="5" strokeStyle="1" edges="
-!0 3000|0 4000!0 4000|1000 4000"/>
-                    <Edge fillStyle0="5" fillStyle1="2" strokeStyle="1" edges="
-!1000 4000|1000 3000!1000 3000|0 3000"/>
-                    <Edge fillStyle1="4" strokeStyle="1" edges="
-!0 1000|0 0"/>
-                    <Edge fillStyle1="2" strokeStyle="1" edges="
-!7000 4000|1000 4000"/>
-                    <Edge fillStyle0="2" strokeStyle="1" edges="
-!7000 0|1000 0"/>
                   </edges>
                 </DOMShape>
               </elements>
diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/blue.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/blue.xml
index f59b98d61..960671973 100644
--- a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/blue.xml
+++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/blue.xml
@@ -36,8 +36,8 @@ trace("init_blue");
                         </StrokeStyle>
                       </strokes>
                       <edges>
-                        <Edge fillStyle1="1" strokeStyle="1" edges="!1321 562[1336 582 1523 825!1523 825[1642 976 1647 1087!1647 1087[1654 1238 1475 1397!1475 1397[1351 1509 1091 1776!1091 1776[861 2014 767 2089!767 2089[619 2208 569 2155!569 2155[511 2092 568 1787!568 1787|724 930!724 930[464 939 243
- 859!243 859[50 787 -57 669!-57 669[-160 555 -134 455!-134 455[-106 348 59 314!59 314[178 288 456 198!456 198[750 102 875 73!875 73[1331 -36 1262 253!1262 253[1226 402 1321 562"/>
+                        <Edge fillStyle1="1" strokeStyle="1" edges="!1523 825[1642 976 1647 1087!1647 1087[1654 1238 1475 1397!1475 1397[1351 1509 1091 1776!1091 1776[861 2014 767 2089!767 2089[619 2208 569 2155!569 2155[511 2092 568 1787!568 1787|724 930!724 930[464 939 243 859!243 859[50 787 -57 669
+!-57 669[-160 555 -134 455!-134 455[-106 348 59 314!59 314[178 288 456 198!456 198[750 102 875 73!875 73[1331 -36 1262 253!1262 253[1226 402 1321 562!1321 562[1336 582 1523 825"/>
                         <Edge cubics="!724 930(;-16,957 -399,411 59,314q724 930Q464 939q243 859Q50 787q-57 669Q-160 555q-134 455Q-106 348q59 314);"/>
                         <Edge cubics="!59 314(;518,215 1372,-211 1262,253q59 314Q178 288q456 198Q750 102q875 73Q1331 -36q1262 253);"/>
                         <Edge cubics="!1262 253(;1152,717 1996,929 1475,1397q1262 253Q1226 402q1321 562Q1336 582q1523 825Q1642 976q1647 1087Q1654 1238q1475 1397);"/>
diff --git a/libsrc/ffdec_lib/testdata/as2/as2/META-INF/metadata.xml b/libsrc/ffdec_lib/testdata/as2/as2/META-INF/metadata.xml
index cc69783f7..9798438a6 100644
--- a/libsrc/ffdec_lib/testdata/as2/as2/META-INF/metadata.xml
+++ b/libsrc/ffdec_lib/testdata/as2/as2/META-INF/metadata.xml
@@ -5,8 +5,8 @@
             xmlns:xmp="http://ns.adobe.com/xap/1.0/">
          <xmp:CreatorTool>Adobe Flash CS4 Professional</xmp:CreatorTool>
          <xmp:CreateDate>2010-08-03T10:48:58+02:00</xmp:CreateDate>
-         <xmp:MetadataDate>2025-07-21T09:57:55-07:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2025-07-21T09:57:55-07:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2025-08-20T13:44:47-07:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2025-08-20T13:44:47-07:00</xmp:ModifyDate>
       </rdf:Description>
       <rdf:Description rdf:about=""
             xmlns:dc="http://purl.org/dc/elements/1.1/">
@@ -22,7 +22,7 @@
             <stRef:originalDocumentID>xmp.did:8DD71700DC9EDF1194ADAC9B23608190</stRef:originalDocumentID>
          </xmpMM:DerivedFrom>
          <xmpMM:DocumentID>xmp.did:F0EB4FF7CAC3ED11AC9DC078F41E1AA7</xmpMM:DocumentID>
-         <xmpMM:InstanceID>xmp.iid:5606F1423266F01194B1B97CA76F6B16</xmpMM:InstanceID>
+         <xmpMM:InstanceID>xmp.iid:FE548D82067EF0118C3CCBF8FBB9AA8B</xmpMM:InstanceID>
          <xmpMM:OriginalDocumentID>xmp.did:8DD71700DC9EDF1194ADAC9B23608190</xmpMM:OriginalDocumentID>
          <xmpMM:History>
             <rdf:Seq>
@@ -500,6 +500,12 @@
                   <stEvt:when>2010-08-03T10:48:58+02:00</stEvt:when>
                   <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
                </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>created</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:FE548D82067EF0118C3CCBF8FBB9AA8B</stEvt:instanceID>
+                  <stEvt:when>2010-08-03T10:48:58+02:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Flash Professional CS6 - build 481</stEvt:softwareAgent>
+               </rdf:li>
             </rdf:Seq>
          </xmpMM:History>
       </rdf:Description>
diff --git a/libsrc/ffdec_lib/testdata/as2/as2/bin/SymDepend.cache b/libsrc/ffdec_lib/testdata/as2/as2/bin/SymDepend.cache
index 43e15297a..e58d15356 100644
Binary files a/libsrc/ffdec_lib/testdata/as2/as2/bin/SymDepend.cache and b/libsrc/ffdec_lib/testdata/as2/as2/bin/SymDepend.cache differ