I think this finally fixes the use-count problem that kept causing duplicates to appear.
Trying to catch the missing image issue