Fix Core.js