Updated for new range comparator class (see issue #212)