Fixed navigator event model