corrected regexps