moar unicode fixing