Fixed the Regex. Now 100% more robust!