regex factory fixes