fixed navigation to prepare for issues when navigating