diff --git a/blogthon.cgi b/blogthon.cgi
index c3a9c10..66d794e 100755
--- a/blogthon.cgi
+++ b/blogthon.cgi
@@ -454,14 +454,14 @@ else:
 								notfirstline = 0 # Ugly fix for closing comment containers
 
 								for line in comments_content:
-									if line.split(".", 1)[0] == "-":
+									if re.search("^-", line):
 										if notfirstline == 1:
 												print '                </div>'
 												print '            </div>'
 												notfirstline = 0;
 										print '            <div class="comment">'
 										print '                <div class="comment_author">' + line.split(".", 1)[1].strip() + '</div>'
-									elif line.split(".", 1)[0] == "+":
+									elif re.search("^\+", line):
 										print '                <div class="comment_date">' + line.split(".", 1)[1].strip() + '</div>'
 										print '                <div class="comment_content">'
 									else: