[Core] Fix after merge