Fixed Lang Support for Navigation