Fix the conflict in the support for multiple versions