fix #9483 better solution by using rankClass only - restoring chanches after merge with previous cleanup
fix #9483 better solution by using rankClass only - restoring chanches after merge with previous cleanup