fix for non-latin character issues