Improved scanning behaviour