diff --git a/brozzler/behaviors.d/noguchi.js.template b/brozzler/behaviors.d/noguchi.js.template
index acf5dc9..f420177 100644
--- a/brozzler/behaviors.d/noguchi.js.template
+++ b/brozzler/behaviors.d/noguchi.js.template
@@ -42,13 +42,9 @@ var umbraIntervalFunc = function() {
 	var target = null;
 
 	var navlinks = document.querySelectorAll("div.nav > a");
-	if (navlinks) {
-		if (navlinks.length > 1) {
-			target = navlinks[1];
-		} else {
-			if (navlinks[0].textContent.startsWith("Next")) {
-				target = navlinks[0];
-			}
+	for (link in navlinks) {
+		if (link.textContent.indexOf("Next") > 0) {
+			target = link;
 		}
 	}
 
@@ -62,7 +58,7 @@ var umbraIntervalFunc = function() {
 			clickedSomething = true;
 			umbraState.idleSince = null;
 			var target_page = re.exec(document.querySelector("div.nav").textContent);
-			console.log('clicked ' + target_page);
+			console.log('clicked ' + target_page[1]);
 			umbraAlreadyClicked[target_page] = true;
 		} else if (where > 0) {
 			somethingLeftBelow = true;