Fixing core dependency