diff --git a/Mycelium Wallet/Models/MYCWallet.m b/Mycelium Wallet/Models/MYCWallet.m
index 7cfd2bc..ebb5bc0 100644
--- a/Mycelium Wallet/Models/MYCWallet.m	
+++ b/Mycelium Wallet/Models/MYCWallet.m	
@@ -1385,13 +1385,15 @@ - (void) discoverAccounts:(BTCKeychain*)rootKeychain accountIndex:(NSInteger)acc
     }
 
     BTCKeychain* accKeychain = [[rootKeychain keychainForAccount:(uint32_t)accountIndex] publicKeychain];
-
-    // Scan 20 external address and 2 internal ones.
     NSMutableArray* addrs = [NSMutableArray array];
-    for (uint32_t j = 0; j < 2; j++) {
+    
+    // Scan external addresses...
+    for (uint32_t j = 0; j < 20; j++) {
         BTCAddress* addr = [self addressForAddress:[BTCPublicKeyAddress addressWithData:BTCHash160([accKeychain externalKeyAtIndex:j].publicKey)]];
         [addrs addObject:addr];
     }
+    
+    // ... and internal addresses.
     for (uint32_t j = 0; j < 2; j++) {
         BTCAddress* addr = [self addressForAddress:[BTCPublicKeyAddress addressWithData:BTCHash160([accKeychain changeKeyAtIndex:j].publicKey)]];
         [addrs addObject:addr];