updated UTF-8 support