Fix long scanning issue