diff --git a/linux/massStorageCopy b/linux/massStorageCopy
index 215d2231..a5f7bd29 100755
Binary files a/linux/massStorageCopy and b/linux/massStorageCopy differ
diff --git a/linux64/massStorageCopy b/linux64/massStorageCopy
index 64f9de7d..596e32e7 100755
Binary files a/linux64/massStorageCopy and b/linux64/massStorageCopy differ
diff --git a/src/massStorageCopy/massStorageCopy.c b/src/massStorageCopy/massStorageCopy.c
index ee28fad0..2308c35e 100644
--- a/src/massStorageCopy/massStorageCopy.c
+++ b/src/massStorageCopy/massStorageCopy.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
       exit(ENOENT);
     }
 
-	p = strtok (output_dev, ",");
+	p = strtok (output_dev, ",\"");
 
     /* split output_dev and append tokens to list_output_dev */
     while (p) {
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
 
       list_output_dev[n_output_dev-1] = p;
 
-      p = strtok (NULL, ",");
+      p = strtok (NULL, ",\"");
     }
 
     /* realloc one extra element for the last NULL */