Fixed to work again 3.1.x and earlier SDKs