#3 bug fix for navigation which is not working.