Fix Cancel Navigation