diff --git a/src/script/org/luaj/jit/LuaJit.java b/src/script/org/luaj/jit/LuaJit.java
index d184425b..0abe27d5 100644
--- a/src/script/org/luaj/jit/LuaJit.java
+++ b/src/script/org/luaj/jit/LuaJit.java
@@ -547,15 +547,13 @@ public class LuaJit extends Lua {
             	String step = "s"+(a+2);
             	String idx = "s"+(a+3);
             	String back = "back"+(forlevel++);
-            	ps.println( "\t\t"+back+"="+step+".luaBinCmpInteger(Lua.OP_LT,0);");
-            	ps.println( "\t\tfor ( "+idx+"="+init+";\n" +
+            	ps.println( "\t\tfor ( "+idx+"="+init+", "+back+"="+step+".luaBinCmpInteger(Lua.OP_LT,0);\n" +
             			"\t\t\t"+back+"? "+idx+".luaBinCmpUnknown(Lua.OP_LE, "+limit+"): "+limit+".luaBinCmpUnknown(Lua.OP_LE, "+idx+");\n" +
             			"\t\t\t"+idx+"="+idx+".luaBinOpUnknown(Lua.OP_ADD,"+step+") ) {");
-                forlevel++;
 				break;
             }
             case LuaState.OP_FORLOOP: {
-            	forlevel--;
+            	--forlevel;
             	ps.println( "\t\t}");
 				//i0 = this.stack[base + a];
 				//step = this.stack[base + a + 2];
diff --git a/src/test/java/org/luaj/vm/LuaJTest.java b/src/test/java/org/luaj/vm/LuaJTest.java
index 740a688d..3bd12fbc 100644
--- a/src/test/java/org/luaj/vm/LuaJTest.java
+++ b/src/test/java/org/luaj/vm/LuaJTest.java
@@ -195,7 +195,8 @@ public class LuaJTest extends TestCase {
                 try {
                         // create closure and execute
                         LClosure c = p.newClosure( state._G );
-                        state.doCall(c, new LValue[0]);
+                        state.pushlvalue(c);
+                        state.call(0,0);
                         
                         final String actualOutput = new String( outputStream.toByteArray() );
                         final String expectedOutput = getExpectedOutput( testName );