diff --git a/src/currency_core/currency_format_utils.cpp b/src/currency_core/currency_format_utils.cpp
index 73bf0200..d78ec011 100644
--- a/src/currency_core/currency_format_utils.cpp
+++ b/src/currency_core/currency_format_utils.cpp
@@ -1017,8 +1017,8 @@ namespace currency
       return true;
     }
     
-    decrypt_payload_items(derivation, tx.extra, decrypted_items, acc_keys, get_tx_pub_key_from_extra(tx));
-    decrypt_payload_items(derivation, tx.attachment, decrypted_items, acc_keys, get_tx_pub_key_from_extra(tx));
+    decrypt_payload_items(derivation, tx.extra, decrypted_items, is_income ? acc_keys: account_keys(), get_tx_pub_key_from_extra(tx));
+    decrypt_payload_items(derivation, tx.attachment, decrypted_items, is_income ? acc_keys : account_keys(), get_tx_pub_key_from_extra(tx));
     return true;
   }
 
diff --git a/tests/core_tests/isolate_auditable_and_proof.cpp b/tests/core_tests/isolate_auditable_and_proof.cpp
index 9b602f09..f752b81a 100644
--- a/tests/core_tests/isolate_auditable_and_proof.cpp
+++ b/tests/core_tests/isolate_auditable_and_proof.cpp
@@ -93,7 +93,9 @@ bool isolate_auditable_and_proof::c1(currency::core& c, size_t ev_index, const s
 
     currency::account_public_address acc = AUTO_VAL_INIT(acc);
     de.addr.front() = auditable_test.get_public_address();
-    currency::transaction tx;
+    de.amount = AMOUNT_TO_TRANSFER_LOCAL;
+    dsts.push_back(de);
+    currency::transaction tx = AUTO_VAL_INIT(tx);
     miner_wlt->transfer(dsts, 0, 0, miner_wlt->get_core_runtime_config().tx_default_fee, extra, attachments, tx);
   }