adapt to changes in core