Better handling of NFD chars