commit #20.1 - fixed the scanner iteration methodology