Didn't really fix the regex, now I did.