Fix for UTF-8 support and non english languages