Fix some regex problem