Fix rebalancing when cluster topology changes