RegExp improved; classname fixed