diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
index 7ab018ac8..09db8b13f 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
@@ -1958,13 +1958,14 @@ public class AVM2Code implements Cloneable {
 
             @Override
             public int updateOperandOffset(long insAddr, long targetAddress, int offset) {
-                //System.err.println("instruction.offset=" + instruction.offset);
-                if ((targetAddress > instruction.offset) || (mapOffsetsAfterIns && (targetAddress == instruction.offset))) {
-                    if (insAddr >= instruction.offset) {
-                        return offset;
-                    }
+                if (((targetAddress > instruction.offset) || (mapOffsetsAfterIns && (targetAddress == instruction.offset)))
+                        && (insAddr < instruction.offset)) {
                     return offset + byteCount;
                 }
+                if (((targetAddress < instruction.offset) || (mapOffsetsAfterIns && (targetAddress == instruction.offset)))
+                        && (insAddr > instruction.offset)) {
+                    return offset - byteCount;
+                }
                 return offset;
             }
         }, body);
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 6eb47253a..2c613e434 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/Graph.java
@@ -1432,6 +1432,9 @@ public class Graph {
             String labelName = "addr" + part.start;
             List<GraphTargetItem> firstCode = partCodes.get(part);
             int firstCodePos = partCodePos.get(part);
+            if (firstCodePos > firstCode.size()) {
+                firstCodePos = firstCode.size();
+            }
             if (firstCode.size() > firstCodePos && (firstCode.get(firstCodePos) instanceof LabelItem)) {
                 labelName = ((LabelItem) firstCode.get(firstCodePos)).labelName;
             } else {