diff --git a/src/zabapgit_page_diff.prog.abap b/src/zabapgit_page_diff.prog.abap
index c42211798..80d13850a 100644
--- a/src/zabapgit_page_diff.prog.abap
+++ b/src/zabapgit_page_diff.prog.abap
@@ -284,13 +284,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
       IF is_diff-mod = c_mod-remote. " Remote file leading changes
         lv_local  = lo_highlighter->process_line( <ls_diff>-old ).
         lv_remote = lo_highlighter->process_line( <ls_diff>-new ).
-*        lv_local  = escape( val = <ls_diff>-old format = cl_abap_format=>e_html_attr ).
-*        lv_remote = escape( val = <ls_diff>-new format = cl_abap_format=>e_html_attr ).
       ELSE.             " Local leading changes or both were modified
         lv_local  = lo_highlighter->process_line( <ls_diff>-new ).
         lv_remote = lo_highlighter->process_line( <ls_diff>-old ).
-*        lv_local  = escape( val = <ls_diff>-new format = cl_abap_format=>e_html_attr ).
-*        lv_remote = escape( val = <ls_diff>-old format = cl_abap_format=>e_html_attr ).
       ENDIF.
 
       get_line_hl( EXPORTING iv_mod    = is_diff-mod
diff --git a/src/zabapgit_syntax_highlighter.prog.abap b/src/zabapgit_syntax_highlighter.prog.abap
index e8d8979c3..6236c5484 100644
--- a/src/zabapgit_syntax_highlighter.prog.abap
+++ b/src/zabapgit_syntax_highlighter.prog.abap
@@ -243,7 +243,7 @@ CLASS lcl_code_highlighter IMPLEMENTATION.
         ls_match-length = <result>-length.
 
         IF ls_match-token = c_token-text.
-          ls_match-text_tag = iv_line+ls_match-offset(ls_match-length).
+          ls_match-text_tag = substring( val = iv_line off = ls_match-offset len = ls_match-length ).
         ENDIF.
 
         APPEND ls_match TO rt_matches.
@@ -343,7 +343,7 @@ CLASS lcl_code_highlighter IMPLEMENTATION.
           <match> TYPE ty_match.
 
     LOOP AT it_matches ASSIGNING <match>.
-      lv_chunk = iv_line+<match>-offset(<match>-length).
+      lv_chunk = substring( val = iv_line off = <match>-offset len = <match>-length ).
 
       CASE <match>-token.
         WHEN c_token-keyword.