Added CoreFix