diff --git a/test/xorriso.c b/test/xorriso.c
index d11bb594..160e7a13 100644
--- a/test/xorriso.c
+++ b/test/xorriso.c
@@ -3103,7 +3103,7 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
                        int *idx, int flag)
 {
  int i, end_idx, ret;
- char target[SfileadrL], source[SfileadrL], *ept;
+ char target[SfileadrL], source[SfileadrL], *ept, eff_path[SfileadrL];
 
  end_idx= Xorriso__end_idx(argc, argv, *idx, 0);
 
@@ -3128,6 +3128,16 @@ int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
      if(ret<=0)
        goto ex;
    }
+
+   ret= Xorriso_normalize_img_path(xorriso, target, eff_path, 2);
+   if(ret<=0)
+     return(ret);
+   strcpy(target, eff_path);
+   ret= Xorriso_normalize_img_path(xorriso, source, eff_path, 2);
+   if(ret<=0)
+     return(ret);
+   strcpy(source, eff_path);
+
    ret= Xorriso_graft_in(xorriso, source, target, 0);
    if(ret<=0)
      goto ex;
@@ -4359,7 +4369,7 @@ int Xorriso_option_rmi(struct XorrisO *xorriso, int argc, char **argv,
                        int *idx, int flag)
 {
  int i, end_idx, ret;
- char path[SfileadrL];
+ char path[SfileadrL], eff_path[SfileadrL];
 
  end_idx= Xorriso__end_idx(argc, argv, *idx, 0);
 
@@ -4371,6 +4381,11 @@ int Xorriso_option_rmi(struct XorrisO *xorriso, int argc, char **argv,
      if(ret<=0)
        goto ex;
    }
+   ret= Xorriso_normalize_img_path(xorriso, path, eff_path, 2);
+   if(ret<=0)
+     return(ret);
+   strcpy(path, eff_path);
+
    ret= Xorriso_rmi(xorriso, path, flag&1);
    if(ret<=0)
      goto ex;
diff --git a/test/xorriso_timestamp.h b/test/xorriso_timestamp.h
index 58c93ad8..7aca9572 100644
--- a/test/xorriso_timestamp.h
+++ b/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2007.10.23.122753"
+#define Xorriso_timestamP "2007.10.24.100156"
diff --git a/test/xorrisoburn.c b/test/xorrisoburn.c
index 6bef1278..46cffb9f 100644
--- a/test/xorrisoburn.c
+++ b/test/xorrisoburn.c
@@ -644,11 +644,21 @@ int Xorriso_graft_in(struct XorrisO *xorriso, char *disk_path, char *img_path,
        Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
        return(0);
      }
+
+     /* >>> copy properties from correspondent directory in disk_path
+            if there is any */;
+
    }
    if(done) {
 attach_source:;
      if(is_dir) {
+
+       /* >>> do this by own recursive operation in order to gain
+              full control with overwriting */;
+
        iso_tree_radd_dir(dir, disk_path, &behav);
+
+
      } else {
        node= iso_tree_add_node(dir, disk_path);
        if(node == NULL) {