more regex fixing