Fixed Navigation issue