diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index fad072d..4d1b348 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -768,10 +768,11 @@ function! s:process_tag_math(line, math) "{{{
     let class = matchstr(a:line, '{{$\zs.*$')
     "FIXME class cannot be any string!
     let class = substitute(class, '\s\+$', '', 'g')
-    " Check the math placeholder (default: displaymath)
-    let b:vimwiki_mathEnv = matchstr(class, '^%\zs\S\+\ze%')
-    if b:vimwiki_mathEnv != ""
-        call add(lines, substitute(class, '^%\(\S\+\)%','\\begin{\1}', ''))
+    " store the environment name in a global variable in order to close the
+    " environment properly
+    let s:current_math_env = matchstr(class, '^%\zs\S\+\ze%')
+    if s:current_math_env != ""
+      call add(lines, substitute(class, '^%\(\S\+\)%','\\begin{\1}', ''))
     elseif class != ""
       call add(lines, "\\\[".class)
     else
@@ -781,8 +782,8 @@ function! s:process_tag_math(line, math) "{{{
     let processed = 1
   elseif math[0] && a:line =~ '^\s*}}\$\s*$'
     let math = [0, 0]
-    if b:vimwiki_mathEnv != ""
-      call add(lines, "\\end{".b:vimwiki_mathEnv."}")
+    if s:current_math_env != ""
+      call add(lines, "\\end{".s:current_math_env."}")
     else
       call add(lines, "\\\]")
     endif
diff --git a/syntax/vimwiki_default.vim b/syntax/vimwiki_default.vim
index 0df4fb2..d4b0a6c 100644
--- a/syntax/vimwiki_default.vim
+++ b/syntax/vimwiki_default.vim
@@ -4,9 +4,6 @@
 " Author: Maxim Kim <habamax@gmail.com>
 " Home: http://code.google.com/p/vimwiki/
 
-" placeholder for math environments
-let b:vimwiki_mathEnv = ""
-
 " text: $ equation_inline $
 let g:vimwiki_rxEqIn = '\$[^$`]\+\$'
 let g:vimwiki_char_eqin = '\$'
diff --git a/syntax/vimwiki_markdown.vim b/syntax/vimwiki_markdown.vim
index 992b6c9..82c3a07 100644
--- a/syntax/vimwiki_markdown.vim
+++ b/syntax/vimwiki_markdown.vim
@@ -4,9 +4,6 @@
 " Author: Maxim Kim <habamax@gmail.com>
 " Home: http://code.google.com/p/vimwiki/
 
-" placeholder for math environments
-let b:vimwiki_mathEnv = ""
-
 " text: $ equation_inline $
 let g:vimwiki_rxEqIn = '\$[^$`]\+\$'
 let g:vimwiki_char_eqin = '\$'
diff --git a/syntax/vimwiki_media.vim b/syntax/vimwiki_media.vim
index 96a2791..9a85083 100644
--- a/syntax/vimwiki_media.vim
+++ b/syntax/vimwiki_media.vim
@@ -4,9 +4,6 @@
 " Author: Maxim Kim <habamax@gmail.com>
 " Home: http://code.google.com/p/vimwiki/
 
-" placeholder for math environments
-let b:vimwiki_mathEnv = ""
-
 " text: $ equation_inline $
 let g:vimwiki_rxEqIn = '\$[^$`]\+\$'
 let g:vimwiki_char_eqin = '\$'