Add quick fix for navigation