Bug Fix in the Navigation (An attempt)