Fix duplicate images + bulletproofing