diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index cd9e1a8..5ac5f6b 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.0.347")]
-[assembly: AssemblyFileVersion("3.0.0.347")]
+[assembly: AssemblyVersion("3.0.0.348")]
+[assembly: AssemblyFileVersion("3.0.0.348")]
diff --git a/Core/Formatter.cs b/Core/Formatter.cs
index bc1f3b5..5a6b951 100644
--- a/Core/Formatter.cs
+++ b/Core/Formatter.cs
@@ -150,13 +150,6 @@ namespace ScrewTurn.Wiki {
 				match = JavascriptRegex.Match(sb.ToString(), match.Index + 1);
 			}
 
-			// Strip out all comments
-			//match = CommentRegex.Match(sb.ToString());
-			//while(match.Success) {
-			//	sb.Remove(match.Index, match.Length);
-			//	match = CommentRegex.Match(sb.ToString(), match.Index + 1);
-			//}
-
 			// Remove empty NoWiki and NoBr tags
 			sb.Replace("<nowiki></nowiki>", "");
 			sb.Replace("<nobr></nobr>", "");
@@ -834,6 +827,15 @@ namespace ScrewTurn.Wiki {
 				}
 			}
 
+			// Strip out all comments
+			if(!bareBones) {
+				match = CommentRegex.Match(sb.ToString());
+				while(match.Success) {
+					sb.Remove(match.Index, match.Length);
+					match = CommentRegex.Match(sb.ToString(), match.Index + 1);
+				}
+			}
+
 			// Remove <nowiki> tags
 			if(!bareBones) {
 				sb.Replace("<nowiki>", "");