diff --git a/vim/.vim/autoload/plug.vim b/vim/.vim/autoload/plug.vim
index bc02f03..25be27f 100644
--- a/vim/.vim/autoload/plug.vim
+++ b/vim/.vim/autoload/plug.vim
@@ -942,6 +942,7 @@ function! s:do(pull, force, todo)
         endif
       elseif type == s:TYPE.funcref
         try
+          call s:load_plugin(spec)
           let status = installed ? 'installed' : (updated ? 'updated' : 'unchanged')
           call spec.do({ 'name': name, 'status': status, 'force': a:force })
         catch
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 18e0a2f..bc7e7a1 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,5 +1,4 @@
-export GOPATH="$HOME/.go"
-export GOPATH="$GOPATH:$HOME/Development/go"
+export GOPATH="$HOME/Development/go"
 export PATH="$HOME/.cargo/bin:$HOME/.gem/bin:$HOME/.go/bin:$GOPATH/bin:$HOME/.bin:$HOME/.local/bin:/usr/local/go/bin:$PATH"
 
 if [[ -x /usr/bin/nvim ]]; then