fix compatability with recent core updates