Fix issue with v2 calls