more regex fix