Navigation fixed again