Fix walk bug exposed by assertion