Hotfix/core spec collision