Clone and set construction fix