Only add core when set