[Core] Fix last commit