diff --git a/node/utils/contentcollector.js b/node/utils/contentcollector.js
index 60bd0a6ef..a7fa940a6 100644
--- a/node/utils/contentcollector.js
+++ b/node/utils/contentcollector.js
@@ -472,10 +472,10 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
           {
             cc.doAttrib(state, "strikethrough");
           }
-          if (tname == "ul")
+          if (tname == "ul" || tname == "ol")
           {
             var type;
-            var rr = cls && /(?:^| )list-(bullet[12345678])\b/.exec(cls);
+            var rr = cls && /(?:^| )list-([a-z]+[12345678])\b/.exec(cls);
             type = rr && rr[1] || "bullet" + String(Math.min(_MAX_LIST_LEVEL, (state.listNesting || 0) + 1));
             oldListTypeOrNull = (_enterList(state, type) || 'none');
           }
diff --git a/static/js/contentcollector.js b/static/js/contentcollector.js
index 577b24c6c..ac7e34028 100644
--- a/static/js/contentcollector.js
+++ b/static/js/contentcollector.js
@@ -470,7 +470,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class
           {
             cc.doAttrib(state, "strikethrough");
           }
-          if (tname == "ul")
+          if (tname == "ul" || tname == "ol")
           {
             var type;
             var rr = cls && /(?:^| )list-([a-z]+[12345678])\b/.exec(cls);