HIP-579 encoding unicode to utf-8
HIP-579 another fix