diff --git a/lib/js/showdown.js b/lib/js/showdown.js
index a0da1145..6731d762 100644
--- a/lib/js/showdown.js
+++ b/lib/js/showdown.js
@@ -992,13 +992,16 @@ var _EncodeCode = function(text) {
 // The point is that in code, these characters are literals,
 // and lose their special Markdown meanings.
 //
+	
+	// Hakim: Escaping these causes issues in code blocks
+
 	// Encode all ampersands; HTML entities are not
 	// entities within a Markdown code span.
-	text = text.replace(/&/g,"&");
+	// text = text.replace(/&/g,"&");
 
 	// Do the angle bracket song and dance:
-	text = text.replace(/</g,"&lt;");
-	text = text.replace(/>/g,"&gt;");
+	// text = text.replace(/</g,"&lt;");
+	// text = text.replace(/>/g,"&gt;");
 
 	// Now, escape characters that are magic in Markdown:
 	text = escapeCharacters(text,"\*_{}[]\\",false);