Specutively address W3C bug 23026 & W3C bug 23027