Adding fix for UTF 8