fixed the special characters matching #83