Draft: small fix to clone object