Be defensive about new major version