Fix feature broken by copy change