Fix up the regex stuff to actually work