Fixup: regex