new regex fixes #11