fixed issue with navigation