diff --git a/modules/barclays/pages.py b/modules/barclays/pages.py
index e12479d9f059acb56842dad5761b1b86cb853d82..455268277eae40dbf625abe7cf177ddb113d30c3 100644
--- a/modules/barclays/pages.py
+++ b/modules/barclays/pages.py
@@ -25,7 +25,8 @@
 from weboob.browser.elements import TableElement, ListElement, ItemElement, method
 from weboob.browser.filters.standard import CleanText, CleanDecimal, Regexp, Field, Date, Eval
 from weboob.browser.filters.html import Attr, TableCell, ReplaceEntities
-from weboob.capabilities.bank import Account, Loan, NotAvailable
+from weboob.capabilities.base import NotAvailable
+from weboob.capabilities.bank import Account, Loan
 from weboob.capabilities.wealth import Investment
 from weboob.tools.capabilities.bank.transactions import FrenchTransaction
 from weboob.tools.capabilities.bank.iban import is_iban_valid
diff --git a/modules/bp/pages/transfer.py b/modules/bp/pages/transfer.py
index ad3c4c180503e314be2d71912d203274c6c88cf7..cf24d267079a7efcb6b6a1aba622e0a518533e4f 100644
--- a/modules/bp/pages/transfer.py
+++ b/modules/bp/pages/transfer.py
@@ -25,10 +25,10 @@
 from datetime import datetime
 
 from weboob.capabilities.bank import (
-    TransferBankError, Transfer, TransferStep, NotAvailable, Recipient,
+    TransferBankError, Transfer, TransferStep, Recipient,
     AccountNotFound, AddRecipientBankError, Emitter,
 )
-from weboob.capabilities.base import find_object, empty
+from weboob.capabilities.base import find_object, empty, NotAvailable
 from weboob.browser.pages import LoggedPage
 from weboob.browser.filters.standard import CleanText, Env, Regexp, Date, CleanDecimal, Currency
 from weboob.browser.filters.html import Attr, Link
diff --git a/modules/cmes/pages.py b/modules/cmes/pages.py
index 1debf7d6991147f1f81ec94ca2aed46f21909448..ea0161ad06b819a230dbd042d8c57cd17fc1a7a2 100644
--- a/modules/cmes/pages.py
+++ b/modules/cmes/pages.py
@@ -28,7 +28,8 @@
     Upper, MapIn, Eval, Title,
 )
 from weboob.browser.filters.html import Link
-from weboob.capabilities.bank import Account, NotAvailable
+from weboob.capabilities.base import NotAvailable
+from weboob.capabilities.bank import Account
 from weboob.capabilities.wealth import Investment, Pocket
 from weboob.tools.capabilities.bank.transactions import FrenchTransaction