Fix copy/paste/change failure