Fix issue with non escaped special characters.