diff --git a/ChangeLog b/ChangeLog
index 9490319da..91f2fda6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/HTMLElement.js: get "HTMLCollection"
+	and "NodeList" classes by class rather than by direct reference.
+
 	* UI/WebServerResources/generic.js (clickEventWrapper): pass the
 	value of "this" to the invoked callback.
 
diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js
index 14fbe47e8..52df36fcb 100644
--- a/UI/WebServerResources/HTMLElement.js
+++ b/UI/WebServerResources/HTMLElement.js
@@ -1,8 +1,9 @@
 /* -*- Mode: js-mode; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
-[HTMLCollection, NodeList].each(
-    function (contClass) {
-        if (contClass) {
+["HTMLCollection", "NodeList"].each(
+    function (className) {
+        if (className in window) {
+            var contClass = window[className];
             var _each = contClass.prototype.forEach;
             if (!_each) {
                 _each = function HTMLElement_each(iterator, context) {