fix the scan issues