diff --git a/CHANGELOG.md b/CHANGELOG.md
index e63a83ca5..84519e69b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,7 @@ All notable changes to this project will be documented in this file.
 - Hex View - incorrect table height when switching tags
 - [#2525] AMF editor (like in Sol cookie editor) - saving empty standard array `[]`
 - AS3 - names with custom namespaces not being deobfuscated
+- AS Debugger - order of trace commands
 
  ### Changed
 - Icon of "Deobfuscation options" menu from pile of pills to medkit
diff --git a/lib/flashdebugger.jar b/lib/flashdebugger.jar
index 5608d0a2b..8c405a7cc 100644
Binary files a/lib/flashdebugger.jar and b/lib/flashdebugger.jar differ
diff --git a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java
index 50f845290..e61fff8ee 100644
--- a/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java
+++ b/src/com/jpexs/decompiler/flash/gui/DebuggerHandler.java
@@ -991,7 +991,7 @@ public class DebuggerHandler implements DebugConnectionListener {
 
             con.addMessageListener(new DebugMessageListener<InTrace>() {
                 @Override
-                public void message(InTrace tr) {
+                public synchronized void message(InTrace tr) {
                     for (TraceListener l : traceListeners) {
                         l.trace(tr.text);
                     }
diff --git a/src/com/jpexs/decompiler/flash/gui/soleditor/SharedObjectsStorage.java b/src/com/jpexs/decompiler/flash/gui/soleditor/SharedObjectsStorage.java
index 74a1486c6..7cd84a9f8 100644
--- a/src/com/jpexs/decompiler/flash/gui/soleditor/SharedObjectsStorage.java
+++ b/src/com/jpexs/decompiler/flash/gui/soleditor/SharedObjectsStorage.java
@@ -25,6 +25,7 @@ import java.nio.file.StandardWatchEventKinds;
 import java.nio.file.WatchKey;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -44,7 +45,7 @@ public class SharedObjectsStorage {
 
     public static Map<WatchKey, File> watchedCookieDirectories = new HashMap<>();
 
-    private static Map<File, List<CookiesChangedListener>> swfFileToListeners = new LinkedHashMap<>();
+    private static Map<File, List<CookiesChangedListener>> swfFileToListeners = Collections.synchronizedMap(new LinkedHashMap<>());
 
     public static void addChangedListener(File file, CookiesChangedListener listener) {
         if (!swfFileToListeners.containsKey(file)) {