Fix scanner going over