Fix shard commit deadlock