Fixed problem with unicode names