diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
index 05e784875..d0ccfa013 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadFromMemoryFrame.java
@@ -278,6 +278,7 @@ public class LoadFromMemoryFrame extends AppFrame implements ActionListener {
                 return null;
             }
 
+            @Override
             public boolean isCellEditable(int rowIndex, int columnIndex) {
                 return false;
             }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java b/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java
index 553a2c99f..5f9c102ff 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/SWFRoot.java
@@ -37,6 +37,7 @@ public class SWFRoot implements TreeNode {
         this.list = list;
     }
 
+    @Override
     public SWF getSwf() {
         return swf;
     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
index 81126002e..50fd05b71 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/TagTreeModel.java
@@ -225,7 +225,7 @@ public class TagTreeModel implements TreeModel {
                 if (obj == it) {
                     return newPath;
                 }
-            }
+            }   
             if (n instanceof TagNode) {
                 TagNode nd = (TagNode) n;
                 if (nd.tag == obj) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
index 8ce9e2585..f716575e1 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ABCPanel.java
@@ -295,7 +295,7 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener, Fr
     
     public void switchAbc(int index) {
         listIndex = index;
-        classTree.setDoABCTags(list, swf);
+        classTree.setSwf(swf);
 
         if (index != -1) {
             this.abc = list.get(index).getABC();
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java
index 57a1f009e..52e451c0f 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/ClassesListTree.java
@@ -95,11 +95,13 @@ public final class ClassesListTree extends JTree implements TreeSelectionListene
         setModel(null);
     }
 
-    public void setDoABCTags(List<ABCContainerTag> list, SWF swf) {
-        this.swf = swf;
-        ClassesListTreeModel model = new ClassesListTreeModel(swf);
-        this.swf.classTreeModel = model;
-        setModel(model);
+    public void setSwf(SWF swf) {
+        if (swf != this.swf) {
+            this.swf = swf;
+            ClassesListTreeModel model = new ClassesListTreeModel(swf);
+            this.swf.classTreeModel = model;
+            setModel(model);
+        }
     }
 
     public void applyFilter(String filter) {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
index e71ff3cfd..3bb38f8c2 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/abc/TreeElement.java
@@ -42,6 +42,7 @@ public class TreeElement implements TreeNode {
         leafs = new TreeMap<>();
     }
 
+    @Override
     public SWF getSwf() {
         return swf;
     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/Tag.java
index be2677c0e..f6e57dcb9 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/Tag.java
@@ -69,6 +69,7 @@ public class Tag implements NeedsCharacters, Exportable, ContainerItem {
         return id;
     }
 
+    @Override
     public SWF getSwf() {
         return swf;
     }