Another navigation ordering fix.