fixing breaking changes