(core) Fix breaking change