diff --git a/autoload/delimitMate.vim b/autoload/delimitMate.vim
index 1a4bec7..392ade0 100644
--- a/autoload/delimitMate.vim
+++ b/autoload/delimitMate.vim
@@ -8,6 +8,8 @@
 
 " Utilities {{{
 
+let delimitMate_loaded = 1
+
 function! delimitMate#ShouldJump() "{{{
 	" Returns 1 if the next character is a closing delimiter.
 	let col = col('.')
diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index 0c26940..3213ca8 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -268,6 +268,12 @@ function! s:DelimitMateSwitch() "{{{
 	endif
 endfunction "}}}
 
+function! s:FlushBuffer()
+	if exists('g:delimitMate_loaded')
+		call delimitMate#FlushBuffer()
+	endif
+endfunction
+
 "}}}
 
 " Mappers: {{{
@@ -405,14 +411,14 @@ augroup delimitMate
 	" Run on new buffers.
 	autocmd BufNewFile,BufRead,BufEnter *
 				\ if !exists("b:loaded_delimitMate") |
-				\ call <SID>DelimitMateDo() |
+				\   call <SID>DelimitMateDo() |
 				\ endif
 
 	" Flush the char buffer:
-	autocmd InsertEnter * call delimitMate#FlushBuffer()
+	autocmd InsertEnter * call <SID>FlushBuffer()
 	autocmd BufEnter *
 				\ if mode() == 'i' |
-				\ call delimitMate#FlushBuffer() |
+				\   call <SID>FlushBuffer() |
 				\ endif
 
 augroup END