Fix for W3C compliance