Copy change to make tests pass