[core] Hotfix