Re: #1589 - fix forlanding on a non-root node