First attempt to fix a new scanner bug.