handle utf in make_master