diff --git a/libexec/rbenv-versions b/libexec/rbenv-versions
index 2fb8fc07..2a762f24 100755
--- a/libexec/rbenv-versions
+++ b/libexec/rbenv-versions
@@ -2,24 +2,22 @@
 set -e
 [ -n "$RBENV_DEBUG" ] && set -x
 
-RBENV_VERSION_NAME="$(rbenv-version-name)"
-
 if [ "$1" = "--bare" ]; then
   hit_prefix=""
   miss_prefix=""
-  print_version="$RBENV_VERSION_NAME"
+  current_version=""
 else
   hit_prefix="* "
   miss_prefix="  "
-  print_version="$(rbenv-version)"
+  current_version="$(rbenv-version-name || true)"
 fi
 
 for path in "${RBENV_ROOT}/versions/"*; do
   if [ -d "$path" ]; then
     version="${path##*/}"
 
-    if [ "$version" == "$RBENV_VERSION_NAME" ]; then
-      echo "${hit_prefix}${print_version}"
+    if [ "$version" == "$current_version" ]; then
+      echo "${hit_prefix}$(rbenv-version)"
     else
       echo "${miss_prefix}${version}"
     fi