Added chipid protection to scans