Fix special chars issue