diff --git a/danio_gcc.sh b/danio_gcc.sh
index 8ec501d..7a6b70c 100755
--- a/danio_gcc.sh
+++ b/danio_gcc.sh
@@ -196,26 +196,21 @@ choose_sub()
 	done
 }
 
+[ -z "${binutils_version}" ] && export binutils_version="master"
+[ -z "${glibc_version}" ]    && export glibc_version="master"
+[ -z "${linux_version}" ]    && export linux_version="master"
+[ -z "${gcc_version}" ]      && export gcc_version="master"
+[ -z "${newlib_version}" ]   && export newlib_version="master"
+
 targets="`grep ' - t=' .travis.yml | cut -f 2 -d = | cut -f 1 -d ' ' | sort -u`"
 if [ "${1}" -a "${2}" ]; then
-	[ -z "${binutils_version}" ] && export binutils_version="master"
-	[ -z "${glibc_version}" ]    && export glibc_version="master"
-	[ -z "${linux_version}" ]    && export linux_version="master"
-	[ -z "${gcc_version}" ]      && export gcc_version="master"
-	[ -z "${newlib_version}" ]   && export newlib_version="master"
 	if echo ${1} | grep -q "eabi"; then export buildnewlib="1" ;fi
 	if echo ${1} | grep -q "elf"; then export buildnewlib="1" ;fi
-	target="echo ${1} | cut -d - -f1"
-	mach="`echo ${1} | cut -d - -f1`"
+	target="`echo ${1} | cut -d - -f1`"
+	mach="`echo ${1} | cut -d - -f2`"
 	runit "${target}-danio-${mach}" ${2}
-	
 elif [ "${AUTOBUILD}" ]; then
 	export clean="1"
-	[ -z "${binutils_version}" ] && export binutils_version="master"
-	[ -z "${glibc_version}" ]    && export glibc_version="master"
-	[ -z "${linux_version}" ]    && export linux_version="master"
-	[ -z "${gcc_version}" ]      && export gcc_version="master"
-	[ -z "${newlib_version}" ]   && export newlib_version="master"
 	if [ "${METHOD}" = "newlib" ]; then
 		export buildnewlib="1"
 		for i in ${targets}; do
@@ -293,7 +288,7 @@ else
 			*) echo "ONLY USE \"1\" or \"2\"!"; sleep 2 ;;
 		esac
 	done
-	if [ "${CUSTOMBUILD}" -ne "0" ]; then
+	if [ "${CUSTOMBUILD}" ]; then
 		while :; do
 			clear || reset
 			echo "Please type gcc version or type \"master\" then press enter"
@@ -334,12 +329,5 @@ else
 				break
 			fi
 		done
-	else
-		[ -z "${binutils_version}" ] && export binutils_version="master"
-		[ -z "${glibc_version}" ]    && export glibc_version="master"
-		[ -z "${linux_version}" ]    && export linux_version="master"
-		[ -z "${gcc_version}" ]      && export gcc_version="master"
-	fi
-	[ -z "${newlib_version}" ] && export newlib_version="master"
 	runit "${arch}-danio-${BASE}" "${BINARY}"
 fi