diff --git a/runtime/Java/src/org/antlr/v4/runtime/nfa/NFA.java b/runtime/Java/src/org/antlr/v4/runtime/nfa/NFA.java
index a219c1260..b34995a7d 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/nfa/NFA.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/nfa/NFA.java
@@ -177,7 +177,7 @@ workLoop:
 			boolean accepted = false;
 processOneChar:
 			while ( i<closure.size() ) {
-				System.out.println("input["+input.index()+"]=="+(char)c+" closure="+closure+", i="+i+", reach="+ reach);
+				//System.out.println("input["+input.index()+"]=="+(char)c+" closure="+closure+", i="+i+", reach="+ reach);
 				ThreadState t = closure.get(i);
 				ip = t.addr;
 				NFAStack context = t.context;
@@ -238,7 +238,7 @@ processOneChar:
 						int j=i+1;
 						while ( j<closure.size() ) {
 							ThreadState cl = closure.get(j);
-							System.out.println("remaining "+ cl);
+							//System.out.println("remaining "+ cl);
 							if ( cl.alt==alt ) closure.remove(j);
 							else j++;
 						}
diff --git a/tool/test/org/antlr/v4/test/TestNFABytecodeInterp.java b/tool/test/org/antlr/v4/test/TestNFABytecodeInterp.java
index c682e569a..e5a61ca33 100644
--- a/tool/test/org/antlr/v4/test/TestNFABytecodeInterp.java
+++ b/tool/test/org/antlr/v4/test/TestNFABytecodeInterp.java
@@ -77,11 +77,22 @@ public class TestNFABytecodeInterp extends BaseTest {
 
 	@Test public void testRecursiveCall() throws Exception {
 		LexerGrammar g = new LexerGrammar(
-			"lexer grammar L;\n" + //TODO 
-			"I : D+ ;\n" +
-			"fragment D : '0'..'9'+ ;\n");
-		String expecting = "I, EOF";
-		checkMatches(g, "32", expecting);
+			"lexer grammar L;\n" +
+			"ACTION : '{' (ACTION|.)* '}' ;\n");
+		String expecting = "ACTION, EOF";
+		checkMatches(g, "{hi}", expecting);
+		checkMatches(g, "{{hi}}", expecting);
+		checkMatches(g, "{{x}{y}}", expecting);
+		checkMatches(g, "{{{{{{x}}}}}}", expecting);
+	}
+
+	@Test public void testAltOrWildcard() throws Exception {
+		LexerGrammar g = new LexerGrammar(
+			"lexer grammar L;\n" +
+			"A : 'a' ;\n" +
+			"ELSE : . ;\n");
+		String expecting = "A, A, ELSE, A, EOF";
+		checkMatches(g, "aaxa", expecting);
 	}
 
 	public void _template() throws Exception {