Update again with native unicode