diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82d8ac1e1..fb07ebef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 - [#1810] AS3 Direct editation - XML attribute handling
 - [#1810] AS3 Direct editation - Calls inside submethods using this
 - [#1891] AS3 - duplicate variable declaration in some cases
+- All SWF classes inside DoABC tags in the taglist view
 
 ## [17.0.2] - 2022-11-22
 ### Fixed
diff --git a/src/com/jpexs/decompiler/flash/gui/taglistview/TagListTreeModel.java b/src/com/jpexs/decompiler/flash/gui/taglistview/TagListTreeModel.java
index d49312df5..43f468714 100644
--- a/src/com/jpexs/decompiler/flash/gui/taglistview/TagListTreeModel.java
+++ b/src/com/jpexs/decompiler/flash/gui/taglistview/TagListTreeModel.java
@@ -75,7 +75,7 @@ public class TagListTreeModel extends AbstractTagTreeModel {
             return abcTagsClassesTree.get(abcContainer);
         }
         
-        ClassesListTreeModel model = new ClassesListTreeModel(abcContainer.getSwf(), Configuration.flattenASPackages.get());
+        ClassesListTreeModel model = new ClassesListTreeModel(abcContainer.getABC(), Configuration.flattenASPackages.get());
         abcTagsClassesTree.put(abcContainer, model);
         return model;
     }