Fix navigation for real