diff --git a/etools b/etools
index 0265c43..f44ecbe 100644
--- a/etools
+++ b/etools
@@ -68,8 +68,8 @@ function etools_get_version() {
 		if [ "$arch" = "x86_64" ]; then
 			arch="amd64"
 		fi
-		if [[ "$ACCEPT_KEYWORDS" == *"~$arch"* ]] || _matches_testing "$1" "\~$arch"; then
-			latest=$(_get_latest "$1" "${2:-${package_offset[$1]:-0}}" "~$arch")
+		if [[ "$ACCEPT_KEYWORDS" == *~$arch* ]] || _matches_testing "$1" "~$arch"; then
+			latest=$(_get_latest "$1" "${2:-${package_offset[$1]:-0}}" "$arch")
 		fi
 		[ -n "$latest" ] && _extract_version "$latest" && "$ETOOLS_DIR"/helper.sh && return 0;
 	fi
diff --git a/helper.sh b/helper.sh
index ead6c53..5c040c8 100755
--- a/helper.sh
+++ b/helper.sh
@@ -170,7 +170,7 @@ function _matches_live() {
 }
 
 function _matches_testing() {
-	[[ "$ACCEPT_KEYWORDS" == *"~amd64"* ]] && return 0;
+	[[ "$ACCEPT_KEYWORDS" == *~$3* ]] && return 0;
 	[ ! -f /etc/portage/package.accept_keywords ] && \
 		[ ! -d /etc/portage/package.accept_keywords ] && \
 		return 1;