Regexp Constraint modified to persist matches