diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.kiss b/projects/nat-archive-tool/src/nat/ArchiveController.kiss
index a34aeec7..8a1b23e4 100644
--- a/projects/nat-archive-tool/src/nat/ArchiveController.kiss
+++ b/projects/nat-archive-tool/src/nat/ArchiveController.kiss
@@ -114,6 +114,8 @@
         (lastCollector)))
 
 
+// TODO SelectedEntry and SelectedEntries functions should be stateful and use the actual
+// selected entries automatically
 (defMacro defCommand [name args &body body]
     (let [argPairs
                 (groups (expList args) 2)
diff --git a/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.kiss b/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.kiss
index 6a3ad21c..96cb4d2f 100644
--- a/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.kiss
+++ b/projects/nat-archive-tool/src/nat/systems/ImageAttachmentSystem.kiss
@@ -5,8 +5,7 @@
         ["jpg" "jpeg" "png"]
         ->[archive e imageFiles]
             (unless (hasComponent e Images)
-                (withWritableEntry archive e
-                    (addComponent archive e Images
-                        (object
-                            imageFiles imageFiles
-                            pinnedImageIndex 0))))))
\ No newline at end of file
+                (addComponent archive e Images
+                    (object
+                        imageFiles imageFiles
+                        pinnedImageIndex 0)))))
\ No newline at end of file