diff --git a/nvm.sh b/nvm.sh
index bd81595..d5bd9e6 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -965,7 +965,7 @@ nvm() {
 
       if [ "_$VERSION" = '_system' ]; then
         if nvm_has_system_node >/dev/null 2>&1; then
-          echo $(nvm use system && echo dirname $(which node))
+          echo $(nvm use system > /dev/null 2>&1 && echo $(which node))
           return
         else
           echo "System version of node not found." >&2
@@ -982,7 +982,7 @@ nvm() {
         echo "$VERSION version is not installed yet" >&2
         return 1
       fi
-      echo $NVM_DIR/$VERSION/bin
+      echo $NVM_DIR/$VERSION/bin/node
     ;;
     "alias" )
       mkdir -p "$NVM_DIR/alias"
diff --git "a/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2." "b/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2."
index 53ddf30..a39a456 100755
--- "a/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2."	
+++ "b/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2."	
@@ -9,12 +9,13 @@ die () { echo $@ ; exit 1; }
 
 # The result should contain only the appropriate version numbers.
 
-nvm which 0.0.2 | grep "$NVM_DIR/v0.0.2/bin" > /dev/null
+nvm which 0.0.2
+nvm which 0.0.2 | grep "$NVM_DIR/v0.0.2/bin/node" > /dev/null
 if [ $? -ne 0 ]; then
   die '"nvm which 0.0.2" did not contain the correct path'
 fi
 
-nvm which 0.0.20 | grep "$NVM_DIR/v0.0.20/bin" > /dev/null
+nvm which 0.0.20 | grep "$NVM_DIR/v0.0.20/bin/node" > /dev/null
 if [ $? -ne 0 ]; then
   die '"nvm which 0.0.2" did not contain the correct path'
 fi