Fix navigation (#646)