diff --git a/z.sh b/z.sh
index 26d92d5..9f11cfd 100644
--- a/z.sh
+++ b/z.sh
@@ -64,7 +64,7 @@ z() {
   # if we hit enter on a completion just go there
   [ -d "$last" ] && cd "$last" && return
   [ -f "$datafile" ] || return
-  cd="$(awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -v tmpfl="$datafile.tmp" -F"|" '
+  local cd="$(awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -v tmpfl="$datafile.tmp" -F"|" '
    function frecent(rank, time) {
     dx = t-time
     if( dx < 3600 ) return rank*4
@@ -135,5 +135,5 @@ z() {
 # tab completion
 complete -C 'z --complete "$COMP_LINE"' z
 # populate directory list. avoid clobbering other PROMPT_COMMANDs.
-echo $PROMPT_COMMAND | grep -q "z"
+echo $PROMPT_COMMAND | grep -q "z --add"
 [ $? -gt 0 ] && PROMPT_COMMAND='z --add "$(pwd -P)";'"$PROMPT_COMMAND"