diff --git a/pyenv.d/exec/pip-rehash/pip b/pyenv.d/exec/pip-rehash/pip
index 28590aad..db3c2d9e 100755
--- a/pyenv.d/exec/pip-rehash/pip
+++ b/pyenv.d/exec/pip-rehash/pip
@@ -23,13 +23,9 @@ STATUS=0
 if [ "$STATUS" == "0" ]; then
   for piparg in "$@"; do
     case ${piparg} in
-    "install" | "uninstall" ) REHASH=0;;
+    "install" | "uninstall" ) pyenv-rehash ; break;;
     esac
   done
 fi
 
-if [ "$REHASH" == "0" ]; then
- pyenv-rehash
-fi
-
-exit "$STATUS"
+exit "$STATUS";