Further tweak to Html back compatibility