Fix navigation  bug