Fix regex to add non-capture group