Fix the scanning issue