Fix to validate markup to W3C