diff --git a/test/xorriso.c b/test/xorriso.c
index 65aeee85..66509b38 100644
--- a/test/xorriso.c
+++ b/test/xorriso.c
@@ -4225,7 +4225,7 @@ int Xorriso_option_rollback(struct XorrisO *xorriso, int flag)
 /* Option -speed */
 int Xorriso_option_speed(struct XorrisO *xorriso, char *speed, int flag)
 {
- int is_cd= 1;
+ int is_cd= 1, unit_found= 0;
  double num;
  char *cpt;
 
@@ -4240,11 +4240,13 @@ int Xorriso_option_speed(struct XorrisO *xorriso, char *speed, int flag)
  break;
  cpt++;
 
- if(*cpt=='k' || *cpt=='K')
-   /* is merchand kilobyte, stays merchand kilobyte */;
- else if(*cpt=='m' || *cpt=='M')
+ if(*cpt=='k' || *cpt=='K') {
+   /* is merchand kilobyte, stays merchand kilobyte */
+   unit_found= 1;
+ } else if(*cpt=='m' || *cpt=='M') {
    num*= 1000;
- else if(*cpt=='x' || *cpt=='X')
+   unit_found= 1;
+ } else if(*cpt=='x' || *cpt=='X')
    cpt++;
 
  if(*cpt=='c' || *cpt=='C') {
@@ -4253,7 +4255,7 @@ cd_speed:;
  } else if(*cpt=='d' || *cpt=='D') {
 dvd_speed:;
    num*= 1385;
- } else {
+ } else if (!unit_found) {
 
    /* >>> try to determine target media */;
 
diff --git a/test/xorriso_timestamp.h b/test/xorriso_timestamp.h
index e2904831..baba48fc 100644
--- a/test/xorriso_timestamp.h
+++ b/test/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2007.10.17.224924"
+#define Xorriso_timestamP "2007.10.17.225039"