Fix for navigation