Small change, tighter regex matching