fixed rescan problem