improved the regex