GRIM: Don't overshoot walk nodes. Fix #699