Fix Cancel Navigation #2