Fixes RangeContext range preservation