Unfuxed the regex a little