diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ba42c409..0b3973ecd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ All notable changes to this project will be documented in this file.
 - [#2480] AS1/2 P-code decompilation of try..catch with empty catch body at the end of function
 - [#2477] AS1/2 deobfuscation - and/or operators, jumps before function start, 
   jumps to function end, jumps in for..in return/break
+- [#2477] AS1/2 Switch in last statement of switch break labels
 
  ### Changed
 - Icon of "Deobfuscation options" menu from pile of pills to medkit
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java
index e21cde475..2c3f4e2ab 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForEachInAVM2Item.java
@@ -31,6 +31,7 @@ import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.Loop;
 import com.jpexs.decompiler.graph.SourceGenerator;
 import com.jpexs.decompiler.graph.TypeItem;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import com.jpexs.decompiler.graph.model.LoopItem;
@@ -168,6 +169,20 @@ public class ForEachInAVM2Item extends LoopItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : commands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
 
     @Override
     public boolean hasReturnValue() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java
index e4b1fc33d..e5cadfa8a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/ForInAVM2Item.java
@@ -31,6 +31,7 @@ import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.Loop;
 import com.jpexs.decompiler.graph.SourceGenerator;
 import com.jpexs.decompiler.graph.TypeItem;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import com.jpexs.decompiler.graph.model.LoopItem;
@@ -152,6 +153,20 @@ public class ForInAVM2Item extends LoopItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : commands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
 
     @Override
     public boolean hasReturnValue() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java
index 215f958f4..c6da6cda7 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/model/clauses/TryAVM2Item.java
@@ -33,6 +33,7 @@ import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.SourceGenerator;
 import com.jpexs.decompiler.graph.TypeItem;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import java.util.ArrayList;
@@ -201,6 +202,40 @@ public class TryAVM2Item extends AVM2Item implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : tryCommands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        if (finallyCommands != null) {
+            for (GraphTargetItem ti : finallyCommands) {
+                if (ti instanceof BreakItem) {
+                    ret.add((BreakItem) ti);
+                }
+                if (ti instanceof Block) {
+                    ret.addAll(((Block) ti).getBreaks());
+                }
+            }
+        }
+        for (List<GraphTargetItem> commands : catchCommands) {
+            for (GraphTargetItem ti : commands) {
+                if (ti instanceof BreakItem) {
+                    ret.add((BreakItem) ti);
+                }
+                if (ti instanceof Block) {
+                    ret.addAll(((Block) ti).getBreaks());
+                }
+            }
+        }
+        return ret;
+    }
 
     @Override
     public boolean needsSemicolon() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ClassAVM2Item.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ClassAVM2Item.java
index 55d32a579..51b904f94 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ClassAVM2Item.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ClassAVM2Item.java
@@ -23,6 +23,7 @@ import com.jpexs.decompiler.graph.DottedChain;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.TypeItem;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import java.util.ArrayList;
@@ -186,6 +187,13 @@ public class ClassAVM2Item extends AVM2Item implements Block {
         List<ContinueItem> ret = new ArrayList<>();
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        return ret;
+    }
+    
 
     @Override
     public boolean needsSemicolon() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java
index 20cbdb5fb..091d02053 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ClassActionItem.java
@@ -34,6 +34,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.SourceGenerator;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import com.jpexs.helpers.Helper;
@@ -273,6 +274,12 @@ public class ClassActionItem extends ActionItem implements Block {
         List<ContinueItem> ret = new ArrayList<>();
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        return ret;
+    }
 
     @Override
     public boolean needsSemicolon() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java
index a06d5ed9c..ee0d51e61 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/ForInActionItem.java
@@ -43,6 +43,7 @@ import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.Loop;
 import com.jpexs.decompiler.graph.SourceGenerator;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import java.util.ArrayList;
@@ -180,6 +181,20 @@ public class ForInActionItem extends LoopActionItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : commands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
 
     @Override
     public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java
index 59c876a2d..ec07f9d5a 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/IfFrameLoadedActionItem.java
@@ -28,6 +28,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.SourceGenerator;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import java.util.ArrayList;
@@ -96,6 +97,11 @@ public class IfFrameLoadedActionItem extends ActionItem implements Block {
         return new ArrayList<>();
     }
 
+    @Override
+    public List<BreakItem> getBreaks() {
+        return new ArrayList<>();
+    }
+        
     @Override
     public List<List<GraphTargetItem>> getSubs() {
         List<List<GraphTargetItem>> ret = new ArrayList<>();
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java
index 71c19e51f..c1af21851 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TellTargetActionItem.java
@@ -32,6 +32,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphSourceItemPos;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.SourceGenerator;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import java.util.ArrayList;
@@ -144,6 +145,20 @@ public class TellTargetActionItem extends ActionItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : commands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
 
     @Override
     public List<List<GraphTargetItem>> getSubs() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java
index f324626bd..7f725876b 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/model/clauses/TryActionItem.java
@@ -42,6 +42,7 @@ import com.jpexs.decompiler.graph.GraphSourceItem;
 import com.jpexs.decompiler.graph.GraphTargetItem;
 import com.jpexs.decompiler.graph.GraphTargetVisitorInterface;
 import com.jpexs.decompiler.graph.SourceGenerator;
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import com.jpexs.decompiler.graph.model.LocalData;
 import java.util.ArrayList;
@@ -191,6 +192,40 @@ public class TryActionItem extends ActionItem implements Block {
         }
         return ret;
     }
+   
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : tryCommands) {
+            if (ti instanceof ContinueItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        if (finallyCommands != null) {
+            for (GraphTargetItem ti : finallyCommands) {
+                if (ti instanceof BreakItem) {
+                    ret.add((BreakItem) ti);
+                }
+                if (ti instanceof Block) {
+                    ret.addAll(((Block) ti).getBreaks());
+                }
+            }
+        }
+        for (List<GraphTargetItem> commands : catchCommands) {
+            for (GraphTargetItem ti : commands) {
+                if (ti instanceof ContinueItem) {
+                    ret.add((BreakItem) ti);
+                }
+                if (ti instanceof Block) {
+                    ret.addAll(((Block) ti).getBreaks());
+                }
+            }
+        }
+        return ret;
+    }
 
     @Override
     public boolean needsSemicolon() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Block.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Block.java
index 7bc1cecf1..5253b3a70 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Block.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Block.java
@@ -16,6 +16,7 @@
  */
 package com.jpexs.decompiler.graph;
 
+import com.jpexs.decompiler.graph.model.BreakItem;
 import com.jpexs.decompiler.graph.model.ContinueItem;
 import java.util.List;
 
@@ -33,6 +34,13 @@ public interface Block {
      * @return List of continues
      */
     public List<ContinueItem> getContinues();
+    
+    /**
+     * Gets all sub breaks.
+     *
+     * @return List of breaks
+     */
+    public List<BreakItem> getBreaks();
 
     /**
      * Gets all sub blocks.
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 5d507f94b..a9a7424a6 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
@@ -1016,12 +1016,91 @@ public class Graph {
         }
         expandGotos(ret);
         processIfs(ret);
+        processSwitches2(ret);
         finalProcessStack(stack, ret, path);
         makeAllCommands(ret, stack);
         finalProcessAll(null, ret, 0, getFinalData(localData, loops, throwStates), path);
         return ret;
     }
 
+    
+    /**
+     * This is needed to avoid loop identifiers in AS1/2. AS3 supports them, but AS1/2 not.
+     * 
+     * loop1: switch(a) {  //has loop identifier
+     *    case 1:
+     *      trace("1");
+     *      break;
+     *    case 2: //last case
+     *      trace("2");
+     *      switch(b) { //last command is switch
+     *         case 3:
+     *         case 4:
+     *            trace("4");
+     *            break loop1; //breaks parent loop
+     *         case 5:
+     *            trace("5");
+     *            break loop1;
+     *         case 6:
+     *            trace("6");
+     *      }
+     * }
+     * 
+     * ==> 
+     * 
+     * switch(a) {
+     *    case 1:
+     *      trace("1");
+     *      break;
+     *    case 2:
+     *      trace("2");
+     *      switch(b) {
+     *         case 3:
+     *         case 4:
+     *            trace("4");
+     *            break;
+     *         case 5:
+     *            trace("5");
+     *            break;
+     *         case 6:
+     *            trace("6");
+     *      }
+     * }
+     * @param list Items
+     */
+    protected void processSwitches2(List<GraphTargetItem> list) {
+        for (int i = 0; i < list.size(); i++) {
+            GraphTargetItem item = list.get(i);
+            if (item instanceof Block) {
+                Block bl = (Block) item;
+                for (List<GraphTargetItem> subList : bl.getSubs()) {
+                    processSwitches2(subList);
+                }
+            }
+            if (item instanceof SwitchItem) {
+                SwitchItem sw = (SwitchItem) item;
+                if (sw.caseCommands.isEmpty()) {
+                    continue;
+                }
+                List<GraphTargetItem> lastCase = sw.caseCommands.get(sw.caseCommands.size() - 1);
+                if (lastCase.isEmpty()) {
+                    continue;
+                }
+                if (!(lastCase.get(lastCase.size() - 1) instanceof SwitchItem)) {
+                    continue; 
+                }
+                SwitchItem swInner = (SwitchItem) lastCase.get(lastCase.size() - 1);
+                                
+                List<BreakItem> breaks = swInner.getBreaks();
+                for (BreakItem br : breaks) {
+                    if (br.loopId == sw.loop.id) {
+                        br.loopId = swInner.loop.id;
+                    }
+                }
+            }            
+        }
+    }
+    
     /**
      * Prepares second pass data. Can return null when no second pass will
      * happen. Override this method to prepare second pass data.
@@ -1051,7 +1130,7 @@ public class Graph {
     protected final void processSwitches(List<GraphTargetItem> list) {
         processSwitches(list, -1);
     }
-
+    
     /*
     
     while(something){
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DoWhileItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DoWhileItem.java
index 0a8904b22..dc265a0d9 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DoWhileItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/DoWhileItem.java
@@ -158,6 +158,20 @@ public class DoWhileItem extends LoopItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : commands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
 
     @Override
     public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/ForItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/ForItem.java
index e3bde30ad..c4ec77c33 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/ForItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/ForItem.java
@@ -185,6 +185,20 @@ public class ForItem extends LoopItem implements Block {
         return ret;
     }
 
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : commands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
+    
     @Override
     public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
         return generator.generate(localData, this);
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/GotoItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/GotoItem.java
index 305179222..42c2a5f82 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/GotoItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/GotoItem.java
@@ -115,6 +115,20 @@ public class GotoItem extends GraphTargetItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        if (targetCommands == null) {
+            return ret;
+        }
+        for (GraphTargetItem c : targetCommands) {
+            if (c instanceof BreakItem) {
+                ret.add((BreakItem) c);
+            }
+        }
+        return ret;
+    }
 
     @Override
     public List<List<GraphTargetItem>> getSubs() {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/IfItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/IfItem.java
index b0a90f982..96dcf92b4 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/IfItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/IfItem.java
@@ -194,6 +194,28 @@ public class IfItem extends GraphTargetItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : onTrue) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        for (GraphTargetItem ti : onFalse) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
 
     @Override
     public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/SwitchItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/SwitchItem.java
index 5a92e066a..1ecc33322 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/SwitchItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/SwitchItem.java
@@ -187,6 +187,23 @@ public class SwitchItem extends LoopItem implements Block {
         }
         return ret;
     }
+    
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+
+        for (List<GraphTargetItem> onecase : caseCommands) {
+            for (GraphTargetItem ti : onecase) {
+                if (ti instanceof BreakItem) {
+                    ret.add((BreakItem) ti);
+                }
+                if (ti instanceof Block) {
+                    ret.addAll(((Block) ti).getBreaks());
+                }
+            }
+        }
+        return ret;
+    }
 
     @Override
     public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/WhileItem.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/WhileItem.java
index 73116c2f0..f6b03d421 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/WhileItem.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/model/WhileItem.java
@@ -151,6 +151,20 @@ public class WhileItem extends LoopItem implements Block {
         return ret;
     }
 
+    @Override
+    public List<BreakItem> getBreaks() {
+        List<BreakItem> ret = new ArrayList<>();
+        for (GraphTargetItem ti : commands) {
+            if (ti instanceof BreakItem) {
+                ret.add((BreakItem) ti);
+            }
+            if (ti instanceof Block) {
+                ret.addAll(((Block) ti).getBreaks());
+            }
+        }
+        return ret;
+    }
+    
     @Override
     public boolean needsSemicolon() {
         return false;
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 66a0d3ded..cedfc6a62 100644
--- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java
+++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2Test.java
@@ -2515,4 +2515,31 @@ public class ActionScript2Test extends ActionScript2TestBase {
                 + "f(tst);\r\n"
         );
     }
+
+    @Test
+    public void frame93_Test() {
+        compareSrc(93, "trace(\"testInnerSwitchNoLabel\");\r\n"
+                + "var a;\r\n"
+                + "var b;\r\n"
+                + "switch(a)\r\n"
+                + "{\r\n"
+                + "case 4:\r\n"
+                + "trace(\"4\");\r\n"
+                + "break;\r\n"
+                + "case 7:\r\n"
+                + "trace(\"7\");\r\n"
+                + "break;\r\n"
+                + "default:\r\n"
+                + "switch(b)\r\n"
+                + "{\r\n"
+                + "case 1:\r\n"
+                + "trace(\"1\");\r\n"
+                + "break;\r\n"
+                + "case 2:\r\n"
+                + "trace(\"2\");\r\n"
+                + "}\r\n"
+                + "}\r\n"
+                + "trace(\"end\");\r\n"
+        );
+    }
 }
diff --git a/libsrc/ffdec_lib/testdata/as2/as2.swf b/libsrc/ffdec_lib/testdata/as2/as2.swf
index 9791b7a10..4f424d142 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 bceacdb16..2d671e804 100644
--- a/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml
+++ b/libsrc/ffdec_lib/testdata/as2/as2/DOMDocument.xml
@@ -31,7 +31,7 @@
           <Include href="Tween 5.xml" itemIcon="1" loadImmediate="false" itemID="60429674-00000289" lastModified="1614976628"/>
      </symbols>
      <timelines>
-          <DOMTimeline name="Scene 1" currentFrame="91">
+          <DOMTimeline name="Scene 1" currentFrame="92">
                <layers>
                     <DOMLayer name="Layer 16" color="#FF4F4F">
                          <frames>
@@ -761,9 +761,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
@@ -3426,6 +3426,32 @@ f(tst);]]></script>
                                    </Actionscript>
                                    <elements/>
                               </DOMFrame>
+                              <DOMFrame index="92" keyMode="9728">
+                                   <Actionscript>
+                                        <script><![CDATA[trace("testInnerSwitchNoLabel");
+var a;
+var b;
+switch(a) {		
+	case 4:	
+		trace("4");
+		break;	
+	case 7:
+		trace("7");
+		break;
+	default:
+		switch(b) {
+			case 1:
+				trace("1");
+				break;
+			case 2:
+				trace("2");
+				break;
+		}
+}
+trace("end");]]></script>
+                                   </Actionscript>
+                                   <elements/>
+                              </DOMFrame>
                          </frames>
                     </DOMLayer>
                </layers>
diff --git a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml
index 158791cc1..cea1a482b 100644
--- a/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml
+++ b/libsrc/ffdec_lib/testdata/as2/as2/LIBRARY/NineSlice.xml
@@ -37,23 +37,30 @@
                     </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" strokeStyle="1" edges="!7000 0|1000 0"/>
-                    <Edge fillStyle0="2" fillStyle1="4" strokeStyle="1" edges="!1000 0|1000 1000!1000 1000|0 1000"/>
-                    <Edge fillStyle1="4" strokeStyle="1" edges="!0 1000|0 0"/>
-                    <Edge fillStyle1="4" edges="!0 0|1000 0"/>
-                    <Edge fillStyle0="1" fillStyle1="2" strokeStyle="1" edges="!7000 0|7000 1000!7000 1000|8000 1000"/>
                     <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 fillStyle1="3" strokeStyle="1" edges="!8000 3000|8000 4000!8000 4000|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 fillStyle1="2" strokeStyle="1" edges="!8000 1000|8000 3000"/>
                     <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" edges="
+!0 0|1000 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 56636e13c..32e670e1f 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="!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 fillStyle1="1" strokeStyle="1" edges="!1262 253[1226 402 1321 562!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"/>
                         <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 37b2464a4..62f052019 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-05-25T02:00:38-07:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2025-05-25T02:00:38-07:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2025-07-11T12:02:19-07:00</xmp:MetadataDate>
+         <xmp:ModifyDate>2025-07-11T12:02:19-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:947ACAA0D438F0118613AED963F21DE9</xmpMM:InstanceID>
+         <xmpMM:InstanceID>xmp.iid:6987AB0A835EF011A31DCCBA7D7D2943</xmpMM:InstanceID>
          <xmpMM:OriginalDocumentID>xmp.did:8DD71700DC9EDF1194ADAC9B23608190</xmpMM:OriginalDocumentID>
          <xmpMM:History>
             <rdf:Seq>
@@ -476,6 +476,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:6987AB0A835EF011A31DCCBA7D7D2943</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 a80d76d3a..f78263d21 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