Fix regex matching