diff --git a/src/main/java/be/quodlibet/boxable/TableCell.java b/src/main/java/be/quodlibet/boxable/TableCell.java
index e750bb14..a5145c4b 100644
--- a/src/main/java/be/quodlibet/boxable/TableCell.java
+++ b/src/main/java/be/quodlibet/boxable/TableCell.java
@@ -170,10 +170,10 @@ private void createInnerTable(float tableWidth, Document document, PDPage curren
 				if (col.attr("colspan") != null && !col.attr("colspan").isEmpty()) {
 					Cell<T> cell = (Cell<T>) row.createCell(
 							tableWidth / columnsSize * Integer.parseInt(col.attr("colspan")) / row.getWidth() * 100,
-							col.html().replace("&amp;", "&"));
+							col.html().replace("&amp;", "&").replace("&gt;", ">").replace("&lt;", "<"));
 				} else {
 					Cell<T> cell = (Cell<T>) row.createCell(tableWidth / columnsSize / row.getWidth() * 100,
-							col.html().replace("&amp;", "&"));
+							col.html().replace("&amp;", "&").replace("&gt;", ">").replace("&lt;", "<"));
 				}
 			}
 			yStart -= row.getHeight();
diff --git a/src/test/java/be/quodlibet/boxable/TableTest.java b/src/test/java/be/quodlibet/boxable/TableTest.java
index 89c74a69..8c9ebc62 100644
--- a/src/test/java/be/quodlibet/boxable/TableTest.java
+++ b/src/test/java/be/quodlibet/boxable/TableTest.java
@@ -1055,7 +1055,7 @@ public void SampleTest10() throws IOException {
 		cell2.setFontSize(6);
 
 		Cell<PDPage> cell3 = row2.createTableCell((100 / 3f),
-				"<table><tr><td>Hello Hello Hello Hello Hello Hello Hello it's me</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1 b1 b1 b1 b1 b1 b1 b1 </td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr></table>",
+				"<table><tr><td>Hello->Hello<-Hello & Hello Hello Hello Hello it's me</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1 b1 b1 b1 b1 b1 b1 b1 </td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr><tr><td>a1</td><td>b1</td></tr></table>",
 				doc, page, yStart, pageBottomMargin, margin);
 		cell3.setFontSize(6);