Fixed special chars issue