fix API break since core 1.503