Fixed navigator lookup