diff --git a/etools b/etools
index 1c6e085..b12b632 100644
--- a/etools
+++ b/etools
@@ -52,8 +52,8 @@ function etools_get_version() {
 	local latest=:
 	. ./helper.sh
 	[ "$ETOOLS_CHECK_LIVE" ] && if _matches_live "$1"; then
-		latest="$(ls -1vr "${ETOOLS_REPO_PATH:-/var/db/repos}/*/$1/*9999*.ebuild" | head "-${2:-1}" 2>/dev/null)"
-		[ -n "$latest" ] && _extract_version "$1" && ./helper.sh && return 0;
+		latest="$(ls -1vr ${ETOOLS_REPO_PATH:-/var/db/repos}/*/$1/*9999*.ebuild | head "-${2:-1}" 2>/dev/null)"
+		[ -n "$latest" ] && _extract_version "$latest" && ./helper.sh && return 0;
 	fi
 	if [ "$ETOOLS_CHECK_TESTING" ]; then
 		. /etc/portage/make.conf
@@ -65,12 +65,12 @@ function etools_get_version() {
 		if [[ "$ACCEPT_KEYWORDS" == *"~$arch"* ]] || _matches_testing "$1" "\~$arch"; then
 			latest=$(_get_latest "$1" "${package_offset[$1]:-0}" "~$arch")
 		fi
-		[ -n "$latest" ] && _extract_version "$1" && ./helper.sh && return 0;
+		[ -n "$latest" ] && _extract_version "$latest" && ./helper.sh && return 0;
 	fi
 	_get_latest "$1" "${package_offset[$1]:-0}" "$arch"
 
-	[ -n "$latest" ] && _extract_version "$1" && ./helper.sh && return 0;
-	ewarn "No version found for package: $1$( (( ! offset == 0 )) && echo " with offset $offset")"
+	[ -n "$latest" ] && _extract_version "$latest" && ./helper.sh && return 0;
+	ewarn "No version found for package: $1$( (( ! ${package_offset[$1]:-0} == 0 )) && echo " with offset $offset")"
 }
 
 
diff --git a/helper.sh b/helper.sh
index 316d4e0..38b1140 100755
--- a/helper.sh
+++ b/helper.sh
@@ -206,6 +206,6 @@ function _extract_version() {
 	ebuild=${ebuild%.ebuild}
 	revision=$(echo "$ebuild" | sed -n 's/.*\(-r[0-9]\+\).*/\1/p')
 	ebuild=${ebuild/-r[[:digit:]]}
-	ebuild=${ebuild##*=}
+	ebuild=${ebuild##*-}
 	echo "$ebuild$revision"
 }