Improved the regex