diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
index 8ad24a841..e47bb2049 100644
--- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs
+++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
@@ -12680,11 +12680,15 @@ namespace PascalABCCompiler.TreeConverter
         internal void CheckOverrideOrReintroduceExpectedWarning(location loc)
         {
             common_method_node cmn = context.top_function as common_method_node;
-            if (!current_converted_method_not_in_class_defined && cmn != null && !cmn.IsReintroduce && cmn.polymorphic_state == SemanticTree.polymorphic_state.ps_common)
-                if (context.FindMethodToOverride(cmn) != null)
+            if (!current_converted_method_not_in_class_defined && cmn != null && !cmn.IsReintroduce && cmn.overrided_method == null)
+            {
+                function_node fn = context.FindMethodToOverride(cmn);
+                if (fn != null)
                 {
                     WarningsList.Add(new OverrideOrReintroduceExpected(loc));
                 }
+            }
+                
         }
 
         private procedure_header current_function_header = null;