diff --git a/lib/ace/mode/folding/html_test.js b/lib/ace/mode/folding/html_test.js
index 3e42cfe0..2698d936 100644
--- a/lib/ace/mode/folding/html_test.js
+++ b/lib/ace/mode/folding/html_test.js
@@ -145,9 +145,9 @@ module.exports = {
         session.setFoldStyle("markbeginend");
         
         assert.equal(session.getFoldWidget(0), "start");
-        assert.equal(session.getFoldWidget(1), "");
+        assert.equal(session.getFoldWidget(1), "start");
         assert.equal(session.getFoldWidget(2), "");
-        assert.equal(session.getFoldWidget(3), "");
+        assert.equal(session.getFoldWidget(3), "start");
         assert.equal(session.getFoldWidget(4), "");
         assert.equal(session.getFoldWidget(5), "end");
         
diff --git a/lib/ace/mode/folding/xml.js b/lib/ace/mode/folding/xml.js
index 68d13423..3a353eba 100644
--- a/lib/ace/mode/folding/xml.js
+++ b/lib/ace/mode/folding/xml.js
@@ -40,8 +40,7 @@ var TokenIterator = require("../../token_iterator").TokenIterator;
 var FoldMode = exports.FoldMode = function(voidElements, optionalEndTags) {
     BaseFoldMode.call(this);
     this.voidElements = voidElements || {};
-    this.optionalEndTags = {};
-    oop.mixin({}, this.voidElements);
+    this.optionalEndTags = oop.mixin({}, this.voidElements);
     if (optionalEndTags)
         oop.mixin(this.optionalEndTags, optionalEndTags);