diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js
index 857e171fb..5c1e8efbf 100644
--- a/src/static/js/contentcollector.js
+++ b/src/static/js/contentcollector.js
@@ -71,8 +71,9 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
     },
     nodeAttr: function(n, a)
     {
-      if(n.getAttribute == null) return null;
-      return n.getAttribute(a);
+      if(n.getAttribute != null) return n.getAttribute(a);
+      if(n.attribs != null) return n.attribs[a];
+      return null;
     },
     optNodeInnerHTML: function(n)
     {
@@ -516,7 +517,7 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
       else if (!isEmpty)
       {
         var styl = dom.nodeAttr(node, "style");
-        var cls = dom.nodeProp(node, "className");
+        var cls = dom.nodeAttr(node, "class");
         var isPre = (tname == "pre");
         if ((!isPre) && abrowser.safari)
         {