diff --git a/files/routes/comments.py b/files/routes/comments.py
index 2896cdf2ea..6e7f3c7b7f 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -198,7 +198,7 @@ def api_comment(v):
 		body = body.replace(i.group(0), "")
 
 	choices = []
-	for i in re.finditer('\s*##([^\$\n]+)##\s*', body, re.A):
+	for i in re.finditer('\s*&&([^\$\n]+)&&\s*', body, re.A):
 		choices.append(i.group(1))
 		body = body.replace(i.group(0), "")
 
@@ -729,7 +729,7 @@ def edit_comment(cid, v):
 				g.db.add(c_option)
 
 		if not c.choices:
-			for i in re.finditer('\s*##([^\$\n]+)##\s*', body, re.A):
+			for i in re.finditer('\s*&&([^\$\n]+)&&\s*', body, re.A):
 				body = body.replace(i.group(0), "")
 				c_choice = Comment(author_id=AUTOCHOICE_ID,
 					parent_submission=c.parent_submission,
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 7d2572eff7..5ac5e876b4 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -511,7 +511,7 @@ def edit_post(pid, v):
 				g.db.add(c)
 
 		if not p.choices.count():
-			for i in re.finditer('\s*##([^\$\n]+)##\s*', body, re.A):
+			for i in re.finditer('\s*&&([^\$\n]+)&&\s*', body, re.A):
 				body = body.replace(i.group(0), "")
 				c = Comment(author_id=AUTOCHOICE_ID,
 					parent_submission=p.id,
@@ -1054,7 +1054,7 @@ def submit_post(v, sub=None):
 		body = body.replace(i.group(0), "")
 
 	choices = []
-	for i in re.finditer('\s*##([^\$\n]+)##\s*', body, re.A):
+	for i in re.finditer('\s*&&([^\$\n]+)&&\s*', body, re.A):
 		choices.append(i.group(1))
 		body = body.replace(i.group(0), "")
 
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index 47160c765d..b4f5f22404 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -107,7 +107,7 @@ You can use Markdown formatting:
 		</tr>
 		<tr>
 			<td>Poll Options (can select only 1 option)</td>
-			<td>##bussy## ##gussy##</td>
+			<td>&&bussy&& &&gussy&&</td>
 			<td>
 				<div class="custom-control">
 					<input name="choice" autocomplete="off" type="radio" class="custom-control-input" id="1338113">