Fix #470 by removing laziness from `scan`