new regex fix