fix for navigation issues