diff --git a/electrum/wallet.py b/electrum/wallet.py
index 401255e8e..f918012a8 100644
--- a/electrum/wallet.py
+++ b/electrum/wallet.py
@@ -1445,10 +1445,10 @@ class Deterministic_Wallet(Abstract_Wallet):
             if len(addresses) < limit:
                 self.create_new_address(for_change)
                 continue
-            if list(map(lambda a: self.address_is_old(a), addresses[-limit:] )) == limit*[False]:
-                break
-            else:
+            if any(map(self.address_is_old, addresses[-limit:])):
                 self.create_new_address(for_change)
+            else:
+                break
 
     def synchronize(self):
         with self.lock: