diff --git a/extendedcommands.c b/extendedcommands.c
index be93770..b691d10 100644
--- a/extendedcommands.c
+++ b/extendedcommands.c
@@ -353,7 +353,8 @@
         return -1;
     }
 
-    if (write(fd, vol->device, strlen(vol->device)) < 0) {
+    if ((write(fd, vol->device, strlen(vol->device)) < 0) &&
+        (!vol->device2 || (write(fd, vol->device, strlen(vol->device2)) < 0))) {
         LOGE("Unable to write to ums lunfile (%s)", strerror(errno));
         close(fd);
         return -1;