Fix for national characters