Changed where safe is cloned to