Updated the regex a bit more.