Possible fix for navigation ordering problems.