Fixed navigator plugin