diff --git a/borg-extract-archiv.sh b/borg-extract-archiv.sh
index ed1da14..718ec07 100755
--- a/borg-extract-archiv.sh
+++ b/borg-extract-archiv.sh
@@ -329,7 +329,7 @@ else
       fi
    done
 fi
-BORG_REPO="${FQPN_BORG_REPO%%.*}"
+BORG_REPO="${FQPN_BORG_REPO}"
 
 
 LIST_OF_FILES_TO_RESTORE=
@@ -407,6 +407,8 @@ if [[ ! ${FQHN_BORG_HOSTNAME}  =~ ^127 ]] && [[ ! "${FQHN_BORG_HOSTNAME,,}"  = "
          BORG_RSH="${_BORG_RSH}"
       fi
    done
+
+   export BORG_RSH
 fi
 
 blank_line
@@ -414,6 +416,10 @@ blank_line
 echo -e "\033[32m--\033[m"
 echo ""
 
+export BORG_HOST
+export BORG_PASSPHRASE
+export BORG_REPO
+
 # List Borg Backups
 #
 (
@@ -437,9 +443,6 @@ done
 echo -e "   \033[33m---------------------------------------------\033[m"
 echo ""
 
-export BORG_PASSPHRASE
-export BORG_REPO
-export BORG_RSH
 
 _BORG_RESTORE_PATH="/data/RESTORE/$(basename "${BORG_REPO}")/${BORG_BACKUP_ID}"