[wip] bug fixing navigator