changed eager to wrapper, c.f. 1502