trying to handle unicode names

Change-Id: Icf936da3ebcf37c88cb937c1175ca37f7ab0cc65