Fix up regex so that _ is actually kept