[D61] (PP, SO) fixed navigation