diff --git a/zsh.d/30-prompt.zsh b/zsh.d/30-prompt.zsh
index d922fde..d084393 100644
--- a/zsh.d/30-prompt.zsh
+++ b/zsh.d/30-prompt.zsh
@@ -15,4 +15,4 @@ PURE_CMD_MAX_EXEC_TIME=30
 # prompt mypure
 # prompt pure
 
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
+#  vim: set ts=4 sw=4 tw=0 ft=zsh :
diff --git a/zsh.d/90-plugins.zsh b/zsh.d/90-plugins.zsh
index fb40e65..7892d8e 100644
--- a/zsh.d/90-plugins.zsh
+++ b/zsh.d/90-plugins.zsh
@@ -10,12 +10,20 @@ whence  thefuck > /dev/null && eval $(thefuck --alias)
 
 # z
 # [ -f $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh ] && source $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh
-whence zoxide > /dev/null && eval eval "$(zoxide init zsh)"
+if [ $(whence zoxide > /dev/null) ]; then  ## zoxide is installed
+  eval $(zoxide init zsh)
+  export Z_COMMAND=zoxide
+elif [ -f $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh ]; then ## zsh-z is installed
+  source $LIBRARY/plugins/zsh-z/zsh-z.plugin.zsh
+  export Z_COMMAND=zsh-z
+else
+  echo "No zoxide or zsh-z found, z command disabled"
+fi
 
 # kubectl/krew
 export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
 
-if whence kubectl > /dev/null; then 
+if whence kubectl > /dev/null; then
   alias k=kubectl
   alias kk='kubectl konfig merge ~/.kube/configs/* > ~/.kube/config'
 fi