diff --git a/lib/ace/ext/static_highlight.js b/lib/ace/ext/static_highlight.js
index 08cc4004..24c97195 100644
--- a/lib/ace/ext/static_highlight.js
+++ b/lib/ace/ext/static_highlight.js
@@ -70,12 +70,12 @@ exports.render = function(input, mode, theme, lineStart, disableGutter) {
             
     var stringBuilder = [];
     var length =  session.getLength();
-    
+
     for(var ix = 0; ix < length; ix++) {
         stringBuilder.push("<div class='ace_line'>");
         if (!disableGutter)
             stringBuilder.push("<span class='ace_gutter ace_gutter-cell' unselectable='on'>" + (ix + lineStart) + "</span>");
-        textLayer.$renderLine(stringBuilder, 0, true, false);
+        textLayer.$renderLine(stringBuilder, ix, true, false);
         stringBuilder.push("</div>");
     }
     
diff --git a/lib/ace/ext/static_highlight_test.js b/lib/ace/ext/static_highlight_test.js
index f6e5c909..707d00ea 100644
--- a/lib/ace/ext/static_highlight_test.js
+++ b/lib/ace/ext/static_highlight_test.js
@@ -16,7 +16,8 @@ module.exports = {
     
     "test simple snippet": function(next) {
         var theme = require("../theme/tomorrow");
-        var snippet = "/** this is a function\n\
+        var snippet = "\
+/** this is a function\n\
 *\n\
 */\n\
 function hello (a, b, c) {\n\
@@ -24,23 +25,16 @@ function hello (a, b, c) {\n\
 }";
         var mode = new JavaScriptMode();
         
-        var isError = false, result;
-        try {
-            result = highlighter.render(snippet, mode, theme);
-        }
-        catch (e) {
-            console.log(e);
-            isError = true;
-        }
-        // todo: write something more meaningful
-        assert.equal(isError, false);
-        
+        var result = highlighter.render(snippet, mode, theme);
+        assert.equal(result.html, "<div class='ace-tomorrow'>        <div class='ace_editor ace_scroller ace_text-layer'>            <div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>1</span><span class='ace_comment ace_doc'>/**&#160;this&#160;is&#160;a&#160;function</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>2</span><span class='ace_comment ace_doc'>*</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>3</span><span class='ace_comment ace_doc'>*/</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>4</span><span class='ace_storage ace_type'>function</span>&#160;<span class='ace_entity ace_name ace_function'>hello</span>&#160;<span class='ace_paren ace_lparen'>(</span><span class='ace_variable ace_parameter'>a</span><span class='ace_punctuation ace_operator'>,&#160;</span><span class='ace_variable ace_parameter'>b</span><span class='ace_punctuation ace_operator'>,&#160;</span><span class='ace_variable ace_parameter'>c</span><span class='ace_paren ace_rparen'>)</span>&#160;<span class='ace_paren ace_lparen'>{</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>5</span>&#160;&#160;&#160;&#160;<span class='ace_storage ace_type'>console</span><span class='ace_punctuation ace_operator'>.</span><span class='ace_support ace_function ace_firebug'>log</span><span class='ace_paren ace_lparen'>(</span><span class='ace_identifier'>a</span>&#160;<span class='ace_keyword ace_operator'>*</span>&#160;<span class='ace_identifier'>b</span>&#160;<span class='ace_keyword ace_operator'>+</span>&#160;<span class='ace_identifier'>c</span>&#160;<span class='ace_keyword ace_operator'>+</span>&#160;<span class='ace_string'>'sup?'</span><span class='ace_paren ace_rparen'>)</span><span class='ace_punctuation ace_operator'>;</span></div><div class='ace_line'><span class='ace_gutter ace_gutter-cell' unselectable='on'>6</span><span class='ace_paren ace_rparen'>}</span></div>        </div>    </div>");
+        assert.ok(!!result.css);
         next();
     },
     
     "test css from theme is used": function(next) {
         var theme = require("../theme/tomorrow");
-        var snippet = "/** this is a function\n\
+        var snippet = "\
+/** this is a function\n\
 *\n\
 */\n\
 function hello (a, b, c) {\n\
@@ -58,7 +52,8 @@ function hello (a, b, c) {\n\
     
     "test theme classname should be in output html": function (next) {
         var theme = require("../theme/tomorrow");
-        var snippet = "/** this is a function\n\
+        var snippet = "\
+/** this is a function\n\
 *\n\
 */\n\
 function hello (a, b, c) {\n\