diff --git a/client/upgrade.py b/client/upgrade.py
index 59a8791f..20bf2e3d 100644
--- a/client/upgrade.py
+++ b/client/upgrade.py
@@ -66,7 +66,14 @@ if __name__ == "__main__":
         exit(1)
 
     if type(x) == tuple:
-        seed_version, use_encryption, fee, host, port, blocks, seed, addresses, private_keys, change_addresses, status, history, labels, addressbook = x
+        seed_version, use_encryption, fee, host, port, blocks, seed, all_addresses, private_keys, change_indexes, status, history, labels, addressbook = x
+        addresses = []
+        change_addresses = []
+        for i in range(len(all_addresses)):
+            if i in change_indexes:
+                change_addresses.append(all_addresses[i])
+            else:
+                addresses.append(all_addresses[i])
         s = {
             'seed_version':seed_version,
             'use_encryption':use_encryption,