Scanner Fix