Fixed problem for navigation