diff --git a/smocore/deviceManager/deviceManager.cpp b/smocore/deviceManager/deviceManager.cpp
index cf2a6b9..b4100be 100644
--- a/smocore/deviceManager/deviceManager.cpp
+++ b/smocore/deviceManager/deviceManager.cpp
@@ -602,10 +602,10 @@ public:
 		[[maybe_unused]] std::shared_ptr<DetachAllAttachedDeviceRoles> context
 		)
 	{
-		for (const auto& spec : DeviceManager::deviceAttachmentSpecs)
+		for (const auto& deviceRole : DeviceManager::attachedDeviceRoles)
 		{
 			DeviceManager::getInstance().detachSenseDeviceReq(
-				spec,
+				deviceRole->deviceAttachmentSpec,
 				{context, std::bind(
 					&DetachAllAttachedDeviceRoles::detachAllAttachedDeviceRoles2,
 					context.get(), context,
@@ -649,7 +649,7 @@ void DeviceManager::detachAllAttachedDeviceRoles(
 	Callback<detachAllAttachedDeviceRolesCbFn> cb
 	)
 {
-	if (DeviceManager::getInstance().deviceAttachmentSpecs.size() == 0)
+	if (DeviceManager::getInstance().attachedDeviceRoles.size() == 0)
 	{
 		AsynchronousLoop tmp(0);
 		cb.callbackFn(tmp);
@@ -658,7 +658,7 @@ void DeviceManager::detachAllAttachedDeviceRoles(
 
 	const auto& caller = ComponentThread::getSelf();
 	auto request = std::make_shared<DetachAllAttachedDeviceRoles>(
-		DeviceManager::getInstance().deviceAttachmentSpecs.size(),
+		DeviceManager::getInstance().attachedDeviceRoles.size(),
 		caller, std::move(cb));
 
 	mrntt::mrntt.thread->getIoService().post(