Fixed some regex