diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab07165812..502939957b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
 - #1503 NullPointer Exception on commandline FLA export
 - AS3 direct editation - invalid generation of lookupswitch
 - AS3 direct editation - fix access to protected members with super
+- #1529 commandline selection of tag ids now applies to sprites and buttons
 
 ### Changed
 - #1378 Transparent background on PNG/GIF sprite export
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index eb5ac2ea06..a3ab227c2b 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -2293,9 +2293,9 @@ public void handleEvent(String event, Object data) {
                 if (exportAll || exportFormats.contains("sprite")) {
                     System.out.println("Exporting sprite...");
                     SpriteExportSettings ses = new SpriteExportSettings(enumFromStr(formats.get("sprite"), SpriteExportMode.class), zoom);
-                    for (CharacterTag c : swf.getCharacters().values()) {
-                        if (c instanceof DefineSpriteTag) {
-                            frameExporter.exportSpriteFrames(handler, outDir + (multipleExportTypes ? File.separator + SpriteExportSettings.EXPORT_FOLDER_NAME : ""), swf, c.getCharacterId(), null, ses, evl);
+                    for (Tag t : extags) {
+                        if (t instanceof DefineSpriteTag) {
+                            frameExporter.exportSpriteFrames(handler, outDir + (multipleExportTypes ? File.separator + SpriteExportSettings.EXPORT_FOLDER_NAME : ""), swf, ((DefineSpriteTag) t).getCharacterId(), null, ses, evl);
                         }
                     }
                 }
@@ -2303,9 +2303,9 @@ public void handleEvent(String event, Object data) {
                 if (exportAll || exportFormats.contains("button")) {
                     System.out.println("Exporting buttons...");
                     ButtonExportSettings bes = new ButtonExportSettings(enumFromStr(formats.get("button"), ButtonExportMode.class), zoom);
-                    for (CharacterTag c : swf.getCharacters().values()) {
-                        if (c instanceof ButtonTag) {
-                            frameExporter.exportButtonFrames(handler, outDir + (multipleExportTypes ? File.separator + ButtonExportSettings.EXPORT_FOLDER_NAME : ""), swf, c.getCharacterId(), null, bes, evl);
+                    for (Tag t : extags) {
+                        if (t instanceof ButtonTag) {
+                            frameExporter.exportButtonFrames(handler, outDir + (multipleExportTypes ? File.separator + ButtonExportSettings.EXPORT_FOLDER_NAME : ""), swf, ((ButtonTag) t).getCharacterId(), null, bes, evl);
                         }
                     }
                 }