Re-added UTF8 support