diff --git a/lib/ace/mode/xquery/XQueryLexer.js b/lib/ace/mode/xquery/XQueryLexer.js
index 481cd13c..461e35e5 100644
--- a/lib/ace/mode/xquery/XQueryLexer.js
+++ b/lib/ace/mode/xquery/XQueryLexer.js
@@ -222,7 +222,8 @@ exports.XQueryLexer = function() {
         }
         
         var token = h.tokens[0];
-        for(var k in Rules[currentState]) {
+        var rules  = Rules[currentState];
+        for(var k = 0; k < rules.length; k++) {
           var rule = Rules[currentState][k];
           if((typeof(rule.name) === "function" && rule.name(token)) || rule.name === token.name) {
             info = rule;
@@ -244,7 +245,7 @@ exports.XQueryLexer = function() {
       } catch(e) {
         if(e instanceof tokenizer.ParseException) {
           var index = 0;
-          for(var i in tokens) {
+          for(var i=0; i < tokens.length; i++) {
             index += tokens[i].value.length;
           }
           tokens.push({ type: "text", value: line.substring(index) });