Fixed image uniqueness issues