fixed the regex handling for underscore