diff --git a/src/checks/zcl_aoc_check_22.clas.abap b/src/checks/zcl_aoc_check_22.clas.abap
index 5d3a020a..cbda07ed 100644
--- a/src/checks/zcl_aoc_check_22.clas.abap
+++ b/src/checks/zcl_aoc_check_22.clas.abap
@@ -1,16 +1,14 @@
 CLASS zcl_aoc_check_22 DEFINITION
   PUBLIC
   INHERITING FROM zcl_aoc_super
-  CREATE PUBLIC.
+  CREATE PUBLIC .
 
   PUBLIC SECTION.
 
-    METHODS constructor.
+    METHODS constructor .
 
     METHODS check
-        REDEFINITION.
-    METHODS get_message_text
-        REDEFINITION.
+        REDEFINITION .
   PROTECTED SECTION.
 
     DATA mo_scan TYPE REF TO zcl_aoc_scan .
@@ -149,23 +147,11 @@ CLASS ZCL_AOC_CHECK_22 IMPLEMENTATION.
 
     enable_rfc( ).
 
-  ENDMETHOD.
-
-
-  METHOD get_message_text.
-
-    CLEAR p_text.
+    insert_scimessage(
+        iv_code = '001'
+        iv_text = 'Conditions contain identical code, &1'(m01) ).
 
-    CASE p_code.
-      WHEN '001'.
-        p_text = 'Conditions contain identical code, &1'.   "#EC NOTEXT
-      WHEN OTHERS.
-        super->get_message_text( EXPORTING p_test = p_test
-                                           p_code = p_code
-                                 IMPORTING p_text = p_text ).
-    ENDCASE.
-
-  ENDMETHOD.                    "GET_MESSAGE_TEXT
+  ENDMETHOD.
 
 
   METHOD loop.
diff --git a/src/checks/zcl_aoc_check_22.clas.xml b/src/checks/zcl_aoc_check_22.clas.xml
index 343b2b5a..a8e4e315 100644
--- a/src/checks/zcl_aoc_check_22.clas.xml
+++ b/src/checks/zcl_aoc_check_22.clas.xml
@@ -13,6 +13,14 @@
     <RSTAT>P</RSTAT>
     <WITH_UNIT_TESTS>X</WITH_UNIT_TESTS>
    </VSEOCLASS>
+   <TPOOL>
+    <item>
+     <ID>I</ID>
+     <KEY>M01</KEY>
+     <ENTRY>Conditions contain identical code, &amp;1</ENTRY>
+     <LENGTH>74</LENGTH>
+    </item>
+   </TPOOL>
    <LINES>
     <TLINE>
      <TDFORMAT>*</TDFORMAT>