Improved fakes scan