better resolve for rebalance