Fixed error with regex matching, special thanks to Jefferson Scher