Added better UTF8 control