diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
index 31c740482..f9cb7ce6f 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
@@ -2849,7 +2849,7 @@ public final class SWF implements SWFContainerItem, Timelined {
                     sprite.setModified(true);
                 }
             } else {
-                removeTagFromTimeline(tag, timeline);
+                removeTagFromTimeline(tag, timelined.getTimeline());
             }
         }
     }
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index 81b23c604..1e2e6b7f3 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -2008,8 +2008,8 @@ public class CommandLineArgumentParser {
                         System.err.println("Tag number should be integer");
                         System.exit(1);
                     }
-                    if (swf.tags.size() >= tagNo) {
-                        System.err.println("Tag number does not exist. Last tag number is: " + (swf.tags.size() - 1));
+                    if (tagNo < 0 || tagNo >= swf.tags.size()) {
+                        System.err.println("Tag number does not exist. Tag number should be between 0 and " + (swf.tags.size() - 1));
                         System.exit(1);
                     }