Fix walkers

A follow-up on #294.