Fix metadata chaining