utf-8 support fix