Fix the potential for navigation leakage