Fixed scanning issue