new fixes for navigation 2