diff --git a/xorriso/misc_funct.c b/xorriso/misc_funct.c
index 4898d9a1..cadf78f9 100644
--- a/xorriso/misc_funct.c
+++ b/xorriso/misc_funct.c
@@ -1065,8 +1065,8 @@ char *Text_shellsafe(char *in_text, char *out_text, int flag)
    } else {
      if(w + 3 > limit) {
 overflow:;
-       strncpy(out_text, "'xorriso: TEXT MUCH TOO LONG ...   ",33);
- break;
+       strcpy(out_text, "'xorriso: TEXT MUCH TOO LONG ... '");
+       return(out_text);
      }
      out_text[w++]= in_text[i];
    }
diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c
index 0fa3812c..c5aebb8f 100644
--- a/xorriso/opts_d_h.c
+++ b/xorriso/opts_d_h.c
@@ -2497,25 +2497,22 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
  };
 
  char *tpt= NULL;
- int i,pass;
+ int i;
 
  Xorriso_restxt(xorriso,"\n"); 
  sprintf(xorriso->result_line,"usage: %s [settings|actions]\n",
          xorriso->progname); 
  Xorriso_result(xorriso,0);
  Xorriso_restxt(xorriso,"\n"); 
- for(pass=0;pass<1;pass++) {
-   for(i=0;1;i++) {
-     if(pass==0)
-       tpt= text[i];
-     
-     if(strcmp(tpt,"@ENDE_OF_HELPTEXT_(HOPEFULLY_UNIQUELY_SILLY_TEXT)@")==0)
-   break;
-     sprintf(xorriso->result_line,"%s\n",tpt);
-     Xorriso_result(xorriso,0);
-     if(xorriso->request_to_abort)
-       return(1);
-   }
+ for(i=0;1;i++) {
+   tpt= text[i];
+   
+   if(strcmp(tpt,"@ENDE_OF_HELPTEXT_(HOPEFULLY_UNIQUELY_SILLY_TEXT)@")==0)
+ break;
+   sprintf(xorriso->result_line,"%s\n",tpt);
+   Xorriso_result(xorriso,0);
+   if(xorriso->request_to_abort)
+     return(1);
  }
  Xorriso_restxt(xorriso,"\n"); 
  return(1);
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index f1cefc2b..a0bc2ea8 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2019.10.28.143339"
+#define Xorriso_timestamP "2019.11.23.132942"