Better method name and fixed regexps for IE