Patch for high Unicode value support