added compatibility with recent Core changes