Fix the core