Fixed bug with full rebalance