diff --git a/nvm-exec b/nvm-exec
index 44d5ddb..bec80c7 100755
--- a/nvm-exec
+++ b/nvm-exec
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(dirname $(realpath "${BASH_SOURCE[0]}"))"
 
 unset NVM_CD_FLAGS
 
diff --git a/nvm.sh b/nvm.sh
index 5aba5d4..2573807 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -4075,8 +4075,14 @@ nvm() {
           nvm_echo "Running node ${VERSION}$(nvm use --silent "${VERSION}" && nvm_print_npm_version)"
         fi
       fi
-      NODE_VERSION="${VERSION}" "${NVM_DIR}/nvm-exec" "$@"
+
+      NVM_EXEC="${NVM_DIR}/nvm-exec"
+      if [ ! -f "${NVM_EXEC}" ]; then
+        NVM_EXEC=`dirname ${BASH_SOURCE[0]-}`/nvm-exec
+      fi
+      NODE_VERSION="${VERSION}" "${NVM_EXEC}" "$@"
     ;;
+
     "ls" | "list")
       local PATTERN
       local NVM_NO_COLORS