MDL-48421 navigation: accounting for potential regression