Adapt ranges too