diff --git a/src/Markdown2HTML.jl b/src/Markdown2HTML.jl
index 89acd47..f28c69d 100644
--- a/src/Markdown2HTML.jl
+++ b/src/Markdown2HTML.jl
@@ -157,7 +157,7 @@ end
 
 function html(io::IO, tex::LaTeX)
     withtag(io, :p, :class => "math") do
-        write(io, string("\\[\n\\begin{align}\n", tex.formula, "\n\\end{align}\n\\]"))
+        write(io, string("\\[\n", tex.formula, "\n\\]"))
     end
 end
 
diff --git a/src/format.jl b/src/format.jl
index d958500..ac8f92a 100644
--- a/src/format.jl
+++ b/src/format.jl
@@ -343,5 +343,9 @@ function wrapline(text, line_width=75)
 end
 
 function latex(io::IO, tex::Markdown.LaTeX)
-    write(io, string("\n\\begin{align}\n", tex.formula, "\n\\end{align}\n"))
+    math_envs = ["align", "equation", "eqnarray"]
+    use_dollars = !any([occursin("\\begin{$me", tex.formula) for me in math_envs])
+    use_dollars && write(io, "\\[")
+    write(io, string("\n", tex.formula, "\n"))
+    use_dollars && write(io, "\\]\n")
 end
diff --git a/test/markdown_test.jl b/test/markdown_test.jl
index 686d539..5daf4a9 100644
--- a/test/markdown_test.jl
+++ b/test/markdown_test.jl
@@ -50,9 +50,7 @@ ref_html = """<h1>H1</h1>
 </div>
 <hr />
 <p class=\"math\">\\[
-\\begin{align}
 more math
-\\end{align}
 \\]</p>
 <ul>
 <li><p>List one</p>