Core hotfix