ScanSetup fix