diff --git a/src/util/signature.cr b/src/util/signature.cr
index 8d2b961..bb16bed 100644
--- a/src/util/signature.cr
+++ b/src/util/signature.cr
@@ -64,11 +64,10 @@ class Dir
         path = File.join dirname, fn
         if File.directory? path
           signatures << Dir.contents_signature path, cache
-          signatures << fn if DirEntry.is_valid? path
         else
           # Only add its signature value to `signatures` when it is a
           #   supported file
-          signatures << fn if ArchiveEntry.is_valid? fn
+          signatures << fn if ArchiveEntry.is_valid?(fn) || is_supported_image_file(fn)
         end
         Fiber.yield
       end