Added nplusone keyword to fix adapt.