Buf fix for propagate metadata