updated utf-8 support