diff --git a/src/install.sh b/src/install.sh
index aac1556..31ecdd3 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -269,6 +269,7 @@ downloadFile() {
   fi
 
   domain=$(echo "$url" | awk -F/ '{print $3}')
+  domain=$(expr match "$domain" '.*\.\(.*\..*\)')
   local msg="Downloading $desc from $domain..."
 
   info "$msg" && html "$msg"
@@ -320,6 +321,7 @@ downloadImage() {
       tried="y"
       doMido "$iso" "$version" "$desc" && return 0
     fi
+    switchEdition "$version"
   fi
 
   if isESD "$version"; then