Patch for utf-8 decomposed characters