Ditched the regex