[nav] Fixed remapping