WIP in progress.. fixing Thrift issue/replication error