fix regEx bugs