Fix sharding