diff --git a/xorriso/emulators.c b/xorriso/emulators.c
index c3e0493e..1b6d1413 100644
--- a/xorriso/emulators.c
+++ b/xorriso/emulators.c
@@ -1577,20 +1577,20 @@ is_pathspec_2:;
            pathspec[0]= 0;
        }
        strcat(pathspec, eff_path);
-       add_pt= pathspec;
      } else
-       add_pt= argv[i];
+       Sfile_str(pathspec, argv[i], 0);
+     add_pt= pathspec;
 
      if(old_root[0]) {
        /* Split pathspec */
-       ret= Fileliste__target_source_limit(pathspec, '=', &ept, 0);
+       ret= Fileliste__target_source_limit(add_pt, '=', &ept, 0);
        if(ret > 0) {
          *ept= 0;
-         iso_rr_pt= pathspec;
+         iso_rr_pt= add_pt;
          disk_pt= ept + 1;
        } else {
          iso_rr_pt= "/";
-         disk_pt= pathspec;
+         disk_pt= add_pt;
        }
        if(root_seen) {
          strcpy(eff_path, iso_rr_pt);
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index 39ec8383..96f4c532 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2011.02.24.192029"
+#define Xorriso_timestamP "2011.02.26.100158"