diff --git a/cve-vulner-manager/cve-ddd/infrastructure/bulletinimpl/impl.go b/cve-vulner-manager/cve-ddd/infrastructure/bulletinimpl/impl.go
index d534fdc3f6d3ea0c4a29ba85ffd93ebaf7168383..c1cbda5a3078e968dcfd511c955a43b81fc44dbc 100644
--- a/cve-vulner-manager/cve-ddd/infrastructure/bulletinimpl/impl.go
+++ b/cve-vulner-manager/cve-ddd/infrastructure/bulletinimpl/impl.go
@@ -179,7 +179,7 @@ func (impl bulletinImpl) documentNotes(sb *domain.SecurityBulletin) DocumentNote
 			if cve.Theme != "" && cve.AffectedProduct != "" {
 				theme := strings.ReplaceAll(cve.Theme, "\n\n", "\r\n\r\n")
 				theme = taskhandler.XmlSpecCharHand(theme)
-				topic = strings.ReplaceAll(theme, cve.AffectedProduct, sb.AffectedVersion[0])
+				topic = strings.ReplaceAll(theme, cve.AffectedProduct, impl.joinVersion(sb))
 			}
 		}