Clone method fix