Fix problem with initial scan disable