Fix walks for long non-matching prefixes