diff --git a/Build/Compilers/Nodebuilders/zdbsp.exe b/Build/Compilers/Nodebuilders/zdbsp.exe
index bc33da367ade97e4996081daacdcc75ab8bdd907..b3ad785438014ea9a7571cb235839c1e2b7c589e 100644
Binary files a/Build/Compilers/Nodebuilders/zdbsp.exe and b/Build/Compilers/Nodebuilders/zdbsp.exe differ
diff --git a/Source/Core/IO/UniversalParser.cs b/Source/Core/IO/UniversalParser.cs
index eacc8989a98579b33b5505b04b769dd19be4cc77..4980ac3226a082fd870801b68788caffeaf56de6 100644
--- a/Source/Core/IO/UniversalParser.cs
+++ b/Source/Core/IO/UniversalParser.cs
@@ -677,15 +677,11 @@ namespace CodeImp.DoomBuilder.IO
 						// Output recursive structure
 						if(whitespace) { db.Append(leveltabs); db.Append(newline); }
 						db.Append(leveltabs); db.Append(de.Current.Key);
-						/*
-						 * Disabled writing comments to UDMF TEXTMAP, because ZDBSP can't handle this properly yet.
-						 * 
 						if(!string.IsNullOrEmpty(c.Comment))
 						{
 							if(whitespace) db.Append("\t");
 							db.Append("// " + c.Comment);
 						}
-						*/
 						db.Append(newline);
 						db.Append(leveltabs); db.Append("{"); db.Append(newline);
 						db.Append(OutputStructure(c, level + 1, newline, whitespace));
diff --git a/Tests/Triangulation/triangulation_m.dbs b/Tests/Triangulation/triangulation_m.dbs
new file mode 100644
index 0000000000000000000000000000000000000000..c4c776daca7584c35d0faf89dc50bb2b0824a800
--- /dev/null
+++ b/Tests/Triangulation/triangulation_m.dbs
@@ -0,0 +1,30 @@
+type = "Doom Builder Map Settings Configuration";
+gameconfig = "ZDoom_DoomHexen.cfg";
+strictpatches = 0;
+
+maps
+{
+	
+	SAD01
+	{
+		
+		grid
+		{
+			backoffsety = 0;
+			backoffsetx = 0;
+			backscalex = 100;
+			gridsize = 32;
+			background = "";
+			backsource = 0;
+			backscaley = 100;
+		}
+		
+		
+		resources
+		{
+		}
+		
+	}
+	
+}
+
diff --git a/Tests/Triangulation/triangulation_m.wad b/Tests/Triangulation/triangulation_m.wad
new file mode 100644
index 0000000000000000000000000000000000000000..ac069b7dc06e35aac53de49b1c48797c468dd724
Binary files /dev/null and b/Tests/Triangulation/triangulation_m.wad differ