Improved regex.