Another attempt to fix the regex