diff --git a/plugin/fireplace.vim b/plugin/fireplace.vim
index 2cf1b33..5a9c6c8 100644
--- a/plugin/fireplace.vim
+++ b/plugin/fireplace.vim
@@ -378,8 +378,10 @@ endfunction
 
 augroup fireplace_connect
   autocmd!
-  autocmd FileType clojure command! -bar -complete=customlist,s:connect_complete -nargs=* Connect :FireplaceConnect <args>
-  autocmd FileType clojure command!      -complete=customlist,fireplace#eval_complete -bang -nargs=* Piggieback :call s:piggieback(<q-args>, <bang>0)
+  autocmd FileType clojure command! -buffer -bar  -complete=customlist,s:connect_complete -nargs=*
+        \ Connect FireplaceConnect <args>
+  autocmd FileType clojure command! -buffer -bang -complete=customlist,fireplace#eval_complete -nargs=*
+        \ Piggieback call s:piggieback(<q-args>, <bang>0)
 augroup END
 
 " Section: Java runner