Fix issue with not honoring @Rank