diff --git a/cpp/s2p/s2p_core.cpp b/cpp/s2p/s2p_core.cpp
index 231990dc..b1803524 100644
--- a/cpp/s2p/s2p_core.cpp
+++ b/cpp/s2p/s2p_core.cpp
@@ -314,9 +314,8 @@ void S2p::CreateDevices()
             device->set_unit(lun);
         }
 
-        const string &k = key_components[2];
         assert(device);
-        SetDeviceProperties(*device, k, value);
+        SetDeviceProperties(*device, key_components[2], value);
     }
 
     if (command.devices_size()) {