Scanner fix