diff --git a/smocore/deviceManager/deviceManager.cpp b/smocore/deviceManager/deviceManager.cpp
index 97a87f4..23eeec2 100644
--- a/smocore/deviceManager/deviceManager.cpp
+++ b/smocore/deviceManager/deviceManager.cpp
@@ -107,8 +107,8 @@ public:
 
 			// Create DeviceRole and add it to both DeviceManager's and Device's collections
 			auto deviceRole = std::make_shared<DeviceRole>(*device, spec);
-			attachedDeviceRoles.push_back(deviceRole);
 			device->deviceRoles.push_back(deviceRole);
+			attachedDeviceRoles.push_back(deviceRole);
 
 			// Callback with success
 			callOriginalCb(true, deviceRole, spec);