work around a thrift bug, all tests pass