Fixed a bug where a trailing accented character is stripped
Added a missing diacritic mapping