Fixed re-scanning