diff --git a/xorriso/sfile.c b/xorriso/sfile.c
index 68c475fe..9758624d 100644
--- a/xorriso/sfile.c
+++ b/xorriso/sfile.c
@@ -619,7 +619,7 @@ int Sfile_bsl_encoder(char **result, char *text, size_t text_len, int flag)
      else if(*rpt == 12)
        *(wpt++)= 'f';
      else if(*rpt == 13)
-       *(wpt++)= 'c';
+       *(wpt++)= 'r';
      else if(*rpt == 27)
        *(wpt++)= 'e';
      else if(*rpt == '\\')
@@ -720,7 +720,7 @@ int Sfile_sep_make_argv(char *progname, char *line, char *separators,
          if(l>0) {
            strncpy(buf + bufl, start, l); buf[bufl + l]= 0;
            if(bsl_mode >= 3) {
-             ret= Sfile_bsl_interpreter(buf, l, &eaten, 0);
+             ret= Sfile_bsl_interpreter(buf + bufl, l, &eaten, 0);
              if(ret <= 0)
                goto ex;
            }
@@ -746,7 +746,7 @@ int Sfile_sep_make_argv(char *progname, char *line, char *separators,
          if(l>0) {
            strncpy(buf + bufl, start, l); buf[bufl + l]= 0;
            if(bsl_mode >= 3) {
-             ret= Sfile_bsl_interpreter(buf, l, &eaten, 0);
+             ret= Sfile_bsl_interpreter(buf + bufl, l, &eaten, 0);
              if(ret <= 0)
                goto ex;
            }
@@ -774,7 +774,7 @@ int Sfile_sep_make_argv(char *progname, char *line, char *separators,
      if(l>0) {
        strncpy(buf + bufl, start, l); buf[bufl + l]= 0;
        if(bsl_mode >= 3) {
-         ret= Sfile_bsl_interpreter(buf, l, &eaten, 0);
+         ret= Sfile_bsl_interpreter(buf + bufl, l, &eaten, 0);
          if(ret <= 0)
            goto ex;
        }
diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h
index bff3715a..c14c69fb 100644
--- a/xorriso/xorriso_timestamp.h
+++ b/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2015.05.17.204220"
+#define Xorriso_timestamP "2015.06.24.155902"