Fix regex to match properly