compatiblity with recent core update