navi also fixed