Fix navigation problem