Replaced p.next() with p.expect(scan.BINARY)