Resolve version
Avoid overriding client