Fix up regex