diff --git a/docx4j-core/src/main/java/org/docx4j/model/datastorage/BindingHyperlinkResolver.java b/docx4j-core/src/main/java/org/docx4j/model/datastorage/BindingHyperlinkResolver.java index da12ecf2d9..34280a7059 100644 --- a/docx4j-core/src/main/java/org/docx4j/model/datastorage/BindingHyperlinkResolver.java +++ b/docx4j-core/src/main/java/org/docx4j/model/datastorage/BindingHyperlinkResolver.java @@ -83,6 +83,10 @@ public int getIndexOfURL(String text) { * @throws JAXBException */ public Hyperlink generateHyperlink(String relId, String url) throws JAXBException { + // replace '&' with '&' + if(url.contains("&")) { + url = url.replaceAll("&(?!amp;)", "&"); + } String hpl = "" +