diff --git a/src/internals/accounts/scanAccountsOnDevice.js b/src/internals/accounts/scanAccountsOnDevice.js
index 4cb1688c..d0e7245c 100644
--- a/src/internals/accounts/scanAccountsOnDevice.js
+++ b/src/internals/accounts/scanAccountsOnDevice.js
@@ -218,10 +218,10 @@ async function buildAccountRaw({
 
   // get a bunch of fresh addresses
   const rawAddresses = await njsAccount.getFreshPublicAddresses()
-  // TODO: waiting for libcore
-  const addresses = rawAddresses.map((strAddr, i) => ({
-    str: strAddr,
-    path: `${accountPath}/${i}'`,
+
+  const addresses = rawAddresses.map(njsAddress => ({
+    str: njsAddress.toString(),
+    path: `${accountPath}/${njsAddress.getDerivationPath()}`,
   }))
 
   const operations = ops.map(op => buildOperationRaw({ core, op, xpub }))