diff --git a/src/Readme.txt b/src/Readme.txt
index e693b00c..30cd94ec 100644
--- a/src/Readme.txt
+++ b/src/Readme.txt
@@ -67,6 +67,10 @@ For further details take a look at LICENSE.txt.
 
 CHANGELOG
 
+5.2.5.0
+
+    * Fix: #665 Improved handling of duplicate classes in JaCoCo files
+
 5.2.4.0
 
     * New: #630 Added "raw mode" (settings:rawMode=true) to disable that coverage data of nested or compiler generated
diff --git a/src/ReportGenerator.Core/Parser/JaCoCoParser.cs b/src/ReportGenerator.Core/Parser/JaCoCoParser.cs
index 93171773..e075393a 100644
--- a/src/ReportGenerator.Core/Parser/JaCoCoParser.cs
+++ b/src/ReportGenerator.Core/Parser/JaCoCoParser.cs
@@ -362,7 +362,10 @@ private static void SetCodeElements(CodeFile codeFile, IEnumerable<XElement> met
                     branches.Add(new Branch(i < line.CoveredBranches ? 1 : 0, identifier));
                 }
 
-                result.Add(line.LineNumber, branches);
+                if (!result.ContainsKey(line.LineNumber))
+                {
+                    result.Add(line.LineNumber, branches);
+                }
             }
 
             return result;