TODO Resolve unicode problem