adapt to api breaking changes