fix UTF-8 support