diff --git a/src/completion.zsh b/src/completion.zsh
index 02d6329..1b9014b 100644
--- a/src/completion.zsh
+++ b/src/completion.zsh
@@ -129,10 +129,10 @@ __enhancd::completion::run() {
 
   tokens=(${(z)LBUFFER})
   cmd=${tokens[1]}
-
-  if [[ "$LBUFFER" =~ "^\ *cd$" ]]; then
+  
+  if [[ "$LBUFFER" =~ "^\s*cd$" ]]; then
     zle ${ENHANCD_COMPLETION_DEFAULT:-expand-or-complete}
-  elif [ "$cmd" = cd ]; then
+  elif [ "$cmd" = "$ENHANCD_COMMAND" ]; then
     __enhancd::completion::complete ${tokens[2,${#tokens}]/#\~/$HOME}
   else
     zle ${ENHANCD_COMPLETION_DEFAULT:-expand-or-complete}