diff --git a/src/define.sh b/src/define.sh
index ef93d41..8474fd8 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -501,8 +501,11 @@ fromFile() {
   local desc="$1"
   local file="${1,,}"
   local arch="${PLATFORM,,}"
+  
+  file="${file//-/_}"
+  file="${file// /_}"
 
-  case "${file// /_}" in
+  case "$file" in
     *"_x64_"* | *"_x64."*)
       arch="x64"
       ;;
@@ -517,7 +520,7 @@ fromFile() {
   local add=""
   [[ "$arch" != "x64" ]] && add="$arch"
 
-  case "${file// /_}" in
+  case "$file" in
     "win7"* | "win_7"* | *"windows7"* | *"windows_7"* )
       id="win7${arch}"
       ;;