Fix issue with regex