Fix issue with navigation