make compatible with changes in core 0.13