fix issues with regex