diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb
index 07ce0440..b8c3dbe8 100644
--- a/test/unit/page_renderer_test.rb
+++ b/test/unit/page_renderer_test.rb
@@ -80,8 +80,8 @@ class PageRendererTest < Test::Unit::TestCase
         %{<div class='maruku-equation'><math class='maruku-mathml' display='block' } +
         %{xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi><mo stretchy='false'>} +
         %{(</mo><mi>x</mi><mo stretchy='false'>)</mo><semantics><annotation-xml encoding='SVG1.1'>} +
-        %{<svg/></annotation-xml></semantics></math><div class='maruku-eq-tex'><code style='display: none;'>} +
-        %{\\sin(x) \\begin{svg}<svg/>\\end{svg}</code></div></div>},
+        %{<svg/></annotation-xml></semantics></math><span class='maruku-eq-tex'><code style='display: none;'>} +
+        %{\\sin(x) \\begin{svg}<svg/>\\end{svg}</code></span></div>},
         "$$\\sin(x) \\begin{svg}<svg/>\\end{svg}$$")
   
     code_block = [ 
@@ -115,7 +115,7 @@ class PageRendererTest < Test::Unit::TestCase
         %{<p>ecuasi\303\263n</p>\n<div class='maruku-equation'><math class='maruku-mathml' } +
         %{display='block' xmlns='http://www.w3.org/1998/Math/MathML'><mi>sin</mi>} +
         %{<mo stretchy='false'>(</mo><mi>x</mi><mo stretchy='false'>)</mo></math>} +
-        %{<div class='maruku-eq-tex'><code style='display: none;'>\\sin(x)</code></div></div>}, 
+        %{<span class='maruku-eq-tex'><code style='display: none;'>\\sin(x)</code></span></div>}, 
         "ecuasi\303\263n\n$$\\sin(x)$$")
   
     assert_markup_parsed_as(
diff --git a/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb b/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb
index 60f2d502..9bf9d500 100644
--- a/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb
+++ b/vendor/plugins/maruku/lib/maruku/ext/math/to_html.rb
@@ -104,7 +104,6 @@ module MaRuKu; module Out; module HTML
 			if mathml
 				add_class_to(mathml, 'maruku-mathml')
 				return mathml
-#				span << mathml 
 			end
 	
 			if png
@@ -122,15 +121,6 @@ module MaRuKu; module Out; module HTML
 		
 		div = create_html_element 'div'
 		add_class_to(div, 'maruku-equation')
-			if self.label  # then numerate
-				span = Element.new 'span'
-				span.attributes['class'] = 'maruku-eq-number'
-				num = self.num
-				span << Text.new("(#{num})")
-				div << span
-				div.attributes['id'] = "eq:#{self.label}"
-			end
-			
 			if mathml
 				add_class_to(mathml, 'maruku-mathml')
 				div << mathml 
@@ -142,12 +132,21 @@ module MaRuKu; module Out; module HTML
 				div << img
 			end
 			
-			source_div = Element.new 'div'
-				add_class_to(source_div, 'maruku-eq-tex')
-				code = convert_to_mathml_none(:equation, self.math.strip)	
-				code.attributes['style'] = 'display: none'
-			source_div << code
-			div << source_div
+			source_span = Element.new 'span'
+            add_class_to(source_span, 'maruku-eq-tex')
+			code = convert_to_mathml_none(:equation, self.math.strip)	
+			code.attributes['style'] = 'display: none'
+			source_span << code
+			div << source_span
+			
+			if self.label  # then numerate
+				span = Element.new 'span'
+				span.attributes['class'] = 'maruku-eq-number'
+				num = self.num
+				span << Text.new("(#{num})")
+				div << span
+				div.attributes['id'] = "eq:#{self.label}"
+			end	
 		div
 	end