CARE #51: Fixed diacritic hooks