diff --git a/src/currency_core/currency_basic.h b/src/currency_core/currency_basic.h
index b968e617..271b8706 100644
--- a/src/currency_core/currency_basic.h
+++ b/src/currency_core/currency_basic.h
@@ -797,7 +797,7 @@ namespace currency
 
 #define ASSET_DESCRIPTOR_OPERATION_LAST_VER      2
 
-  typedef boost::variant<dummy> asset_descriptor_operator_etc_fields;
+  typedef boost::variant<dummy> asset_descriptor_operation_etc_fields;
 
   struct asset_descriptor_operation
   {
@@ -808,7 +808,7 @@ namespace currency
     boost::optional<crypto::public_key>         opt_asset_id;      // target asset_id - for update/emit
     boost::optional<asset_descriptor_base>      opt_descriptor;    //used in deploy/update
     boost::optional<uint64_t>                   opt_amount;        //used in burn/emit
-    std::vector<asset_descriptor_operator_etc_fields> etc;         //reserved for future use
+    std::vector<asset_descriptor_operation_etc_fields> etc;         //reserved for future use
 
 
     BEGIN_VERSIONED_SERIALIZE(ASSET_DESCRIPTOR_OPERATION_LAST_VER, version)
diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp
index 9dfae001..bb04b760 100644
--- a/src/currency_core/currency_format_utils.cpp
+++ b/src/currency_core/currency_format_utils.cpp
@@ -609,7 +609,7 @@ namespace currency
     CHECK_AND_ASSERT_MES(count_type_in_variant_container<asset_operation_proof>(context.tx.proofs) == 1, false, "asset_operation_proof not present or present more than once");
     const asset_operation_proof& aop = get_type_in_variant_container_by_ref<const asset_operation_proof>(context.tx.proofs);
 
-    if (context.ado.descriptor.hidden_supply)
+    if (context.ado.opt_descriptor.has_value() && context.ado.opt_descriptor->hidden_supply)
     {
       CHECK_AND_ASSERT_MES(aop.opt_amount_commitment_composition_proof.has_value(), false, "opt_amount_commitment_composition_proof is absent");
       // TODO @#@# if asset is hidden -- check composition proof