Fix non latin character bug