diff --git a/nvm-exec b/nvm-exec
index c47cd06..adbdbda 100755
--- a/nvm-exec
+++ b/nvm-exec
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
-DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+SOURCE=${BASH_SOURCE[0]}
+test -L "$SOURCE" && SOURCE=`readlink "$SOURCE"`
+DIR="$(command cd "$( dirname "$SOURCE" )" && pwd )"
 
 # shellcheck disable=SC1090
 \. "$DIR/nvm.sh" --no-use
diff --git a/nvm.sh b/nvm.sh
index d710274..c0a240f 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -3201,7 +3201,9 @@ 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"
+      test ! -f "$NVM_EXEC" && NVM_EXEC=`dirname ${BASH_SOURCE[0]-}`/nvm-exec
+      NODE_VERSION="$VERSION" "$NVM_EXEC" "$@"
     ;;
     "ls" | "list" )
       local PATTERN