Trying to fix the scanner (again)