Fixed the core