Fix for navigation, part 2.