Fixed some regex matching