diff --git a/silkaj/tx.py b/silkaj/tx.py
index 7f62613d86835a21098d4a81df6d54d50756a3e2..5f14c006e5b3acdd929923c68285ee2b00a27c7c 100644
--- a/silkaj/tx.py
+++ b/silkaj/tx.py
@@ -180,7 +180,7 @@ def generate_and_send_transaction(
                 issuers,
                 totalAmountInput,
                 listinput_and_amount,
-                outputAddresses,
+                issuers,
                 "Change operation",
             )
             transaction += sign_document_from_seed(transaction, seed) + "\n"
@@ -251,8 +251,11 @@ def generate_transaction_document(
     ################
     listoutput = []
     # Outputs to receiver (if not himself)
-    for outputAddress in outputAddresses:
+    if isinstance(outputAddresses, str):
         generate_output(listoutput, curentUnitBase, AmountTransfered, outputAddresses)
+    else:
+        for outputAddress in outputAddresses:
+            generate_output(listoutput, curentUnitBase, AmountTransfered, outputAddress)
 
     # Outputs to himself
     rest = totalAmountInput - totalAmountTransfered