fixing issue with navigation