fix navigate