Improved utf-8 compatibility