Fix for navigation.