diff --git a/src/message.c b/src/message.c
index 62bc85e..a0d2219 100755
--- a/src/message.c
+++ b/src/message.c
@@ -467,21 +467,25 @@ TidyMessageImpl *formatCustomTagDetected(TidyDocImpl* doc, Node *element, Node *
 
     TagToString(element, elemdesc, sizeof(elemdesc));
 
-    switch ( cfg( doc, TidyUseCustomTags ) )
+    switch ( code )
     {
-        case TidyCustomBlocklevel:
-            tagtype = tidyLocalizedString( TIDYCUSTOMBLOCKLEVEL_STRING );
-            break;
-        case TidyCustomEmpty:
-            tagtype = tidyLocalizedString( TIDYCUSTOMEMPTY_STRING );
-            break;
-        case TidyCustomInline:
-            tagtype = tidyLocalizedString( TIDYCUSTOMINLINE_STRING );
-            break;
-        case TidyCustomPre:
-        default:
-            tagtype = tidyLocalizedString( TIDYCUSTOMPRE_STRING );
-            break;
+        case CUSTOM_TAG_DETECTED:
+            switch ( cfg( doc, TidyUseCustomTags ) )
+            {
+                case TidyCustomBlocklevel:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMBLOCKLEVEL_STRING );
+                    break;
+                case TidyCustomEmpty:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMEMPTY_STRING );
+                    break;
+                case TidyCustomInline:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMINLINE_STRING );
+                    break;
+                case TidyCustomPre:
+                default:
+                    tagtype = tidyLocalizedString( TIDYCUSTOMPRE_STRING );
+                    break;
+            }
     }
 
     return TY_(tidyMessageCreateWithNode)(doc, element, code, TidyInfo, elemdesc, tagtype );
@@ -818,30 +822,6 @@ void TY_(ReportNotice)(TidyDocImpl* doc, Node *element, Node *node, uint code)
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyWarning, nodedesc, HTMLVersion( doc ) );
             break;
 
-            
-        case CUSTOM_TAG_DETECTED:
-            TagToString(element, elemdesc, sizeof(elemdesc));
-
-            switch ( cfg( doc, TidyUseCustomTags ) )
-            {
-                case TidyCustomBlocklevel:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMBLOCKLEVEL_STRING );
-                    break;
-                case TidyCustomEmpty:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMEMPTY_STRING );
-                    break;
-                case TidyCustomInline:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMINLINE_STRING );
-                    break;
-                case TidyCustomPre:
-                default:
-                    tagtype = tidyLocalizedString( TIDYCUSTOMPRE_STRING );
-                    break;
-            }
-            message = TY_(tidyMessageCreateWithNode)(doc, element, code, TidyInfo, elemdesc, tagtype );
-            break;
-
-            
         case ELEMENT_VERS_MISMATCH_ERROR:
             message = TY_(tidyMessageCreateWithNode)(doc, node, code, TidyError, nodedesc, HTMLVersion( doc ) );
             break;
diff --git a/src/tags.c b/src/tags.c
index 4ae9886..40486bc 100644
--- a/src/tags.c
+++ b/src/tags.c
@@ -581,7 +581,7 @@ Bool TY_(FindTag)( TidyDocImpl* doc, Node *node )
 
         /* Output a message the first time we encounter an autonomous custom 
            tag. This applies despite the HTML5 mode. */
-        TY_(ReportNotice)(doc, node, node, CUSTOM_TAG_DETECTED);
+        TY_(Report)(doc, node, node, CUSTOM_TAG_DETECTED);
 
         return yes;
     }