Oops, always using pass 1 - fixed.