Final fix for navigation.