One more fix for navigation.