Performance fix for host scanner