Finally fix the regex problem? Time will tell...