diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim
index 47d9cd8..90f97f0 100644
--- a/plugin/gitgutter.vim
+++ b/plugin/gitgutter.vim
@@ -533,9 +533,9 @@ endfunction
 augroup gitgutter
   autocmd!
   if g:gitgutter_on_bufenter
-    autocmd BufEnter,BufWritePost,FileWritePost * call GitGutter(expand('<afile>'))
+    autocmd BufEnter,BufWritePost,FileWritePost * call GitGutter(s:current_file())
   else
-    autocmd BufReadPost,BufWritePost,FileReadPost,FileWritePost * call GitGutter(expand('<afile>'))
+    autocmd BufReadPost,BufWritePost,FileReadPost,FileWritePost * call GitGutter(s:current_file())
   endif
   if g:gitgutter_all_on_focusgained
     if !has('gui_win32')