diff --git a/‎src/TensorFlowNET.Core/NumPy/AutoNumPyAttribute.cs‎
Lines changed: 2 additions & 0 deletions b/‎src/TensorFlowNET.Core/NumPy/AutoNumPyAttribute.cs‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/TensorFlowNET.Core/NumPy/NumPy.Sorting.Searching.Counting.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/TensorFlowNET.Core/NumPy/NumPy.Sorting.Searching.Counting.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/TensorFlowNET.Core/Numpy/NDArray.Creation.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/TensorFlowNET.Core/Numpy/NDArray.Creation.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/TensorFlowNET.Core/Operations/Operation.Input.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/TensorFlowNET.Core/Operations/Operation.Input.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/TensorFlowNET.Core/Operations/Operation.Output.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/TensorFlowNET.Core/Operations/Operation.Output.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs‎
Lines changed: 4 additions & 1 deletion b/‎src/TensorFlowNET.Core/Tensors/Tensor.Creation.cs‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎src/TensorFlowNET.Core/Tensors/Tensor.Value.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/TensorFlowNET.Core/Tensors/Tensor.Value.cs‎
Lines changed: 1 addition & 1 deletion
@@ -1,13 +1,15 @@
 using MethodBoundaryAspect.Fody.Attributes;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using Tensorflow.Eager;
 using Tensorflow.Functions;
 using static Tensorflow.Binding;
 
 namespace Tensorflow.NumPy
 {
+    [DebuggerStepThrough]
     public sealed class AutoNumPyAttribute : OnMethodBoundaryAspect
     {
         bool _changedMode = false;
 
@@ -10,7 +10,7 @@ public partial class np
     {
         [AutoNumPy]
         public static NDArray argmax(NDArray a, Axis axis = null)
-            => new NDArray(math_ops.argmax(a, axis));
+            => new NDArray(math_ops.argmax(a, axis ?? 0));
 
         [AutoNumPy]
         public static NDArray argsort(NDArray a, Axis axis = null)
 
@@ -31,7 +31,7 @@ public NDArray(long[] value, Shape? shape = null)
         public NDArray(IntPtr address, Shape shape, TF_DataType dtype) 
             : base(address, shape, dtype) { NewEagerTensorHandle(); }
 
-        public NDArray(Tensor tensor, bool eval = true) : base(tensor.Handle) 
+        public NDArray(Tensor tensor, bool clone = false) : base(tensor.Handle, clone: clone) 
         {
             if (_handle is null)
             {
 
@@ -35,7 +35,7 @@ public int InputListLength(string name)
             tf.Status.Check(true);
             return num;
         }
-        public int NumInputs => c_api.TF_OperationNumInputs(_handle);
+        public int NumInputs => _handle == IntPtr.Zero ? -1 : c_api.TF_OperationNumInputs(_handle);
         private TF_DataType[] _input_types => _inputs_val._inputs.Select(x => x.dtype).ToArray();
 
         protected InputList _inputs_val;
 
@@ -23,7 +23,7 @@ namespace Tensorflow
 {
     public partial class Operation
     {
-        public int NumOutputs => c_api.TF_OperationNumOutputs(_handle);
+        public int NumOutputs => _handle == IntPtr.Zero ? -1 : c_api.TF_OperationNumOutputs(_handle);
         public TF_DataType OutputType(int index) => c_api.TF_OperationOutputType(_tf_output(index));
 
         public int OutputListLength(string name)
@@ -38,7 +38,7 @@ public int OutputListLength(string name)
         public virtual Tensor[] outputs => _outputs;
         public Tensor output => _outputs.FirstOrDefault();
 
-        public int NumControlOutputs => c_api.TF_OperationNumControlOutputs(_handle);
+        public int NumControlOutputs => _handle == IntPtr.Zero ? -1 : c_api.TF_OperationNumControlOutputs(_handle);
 
         public int OutputNumConsumers(int index) => c_api.TF_OperationOutputNumConsumers(new TF_Output(_handle, index));
 
 
@@ -39,9 +39,12 @@ public Tensor()
         ///     Create a Tensor object from an existing TF handle
         /// </summary>
         /// <param name="handle">Handle to a <see cref="Tensor"/> object.</param>
-        public Tensor(SafeTensorHandle handle)
+        public unsafe Tensor(SafeTensorHandle handle, bool clone = false)
         {
             _handle = handle;
+            if (clone)
+                _handle = TF_NewTensor(shape, dtype, data: TensorDataPointer.ToPointer());
+                
             isCreatedInGraphMode = !tf.executing_eagerly();
         }
 
 
@@ -55,7 +55,7 @@ protected NDArray GetNDArray(TF_DataType dtype)
                 return new NDArray(str, shape);
             }
 
-            return new NDArray(this);
+            return new NDArray(this, clone: true);
         }
 
         /// <summary>
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ public partial class np
10	10	{
11	11	[AutoNumPy]
12	12	public static NDArray argmax(NDArray a, Axis axis = null)
13		- => new NDArray(math_ops.argmax(a, axis));
	13	+ => new NDArray(math_ops.argmax(a, axis ?? 0));
14	14
15	15	[AutoNumPy]
16	16	public static NDArray argsort(NDArray a, Axis axis = null)
Original file line number	Diff line number	Diff line change
@@ -31,7 +31,7 @@ public NDArray(long[] value, Shape? shape = null)
31	31	public NDArray(IntPtr address, Shape shape, TF_DataType dtype)
32	32	: base(address, shape, dtype) { NewEagerTensorHandle(); }
33	33
34		- public NDArray(Tensor tensor, bool eval = true) : base(tensor.Handle)
	34	+ public NDArray(Tensor tensor, bool clone = false) : base(tensor.Handle, clone: clone)
35	35	{
36	36	if (_handle is null)
37	37	{
Original file line number	Diff line number	Diff line change
@@ -35,7 +35,7 @@ public int InputListLength(string name)
35	35	tf.Status.Check(true);
36	36	return num;
37	37	}
38		- public int NumInputs => c_api.TF_OperationNumInputs(_handle);
	38	+ public int NumInputs => _handle == IntPtr.Zero ? -1 : c_api.TF_OperationNumInputs(_handle);
39	39	private TF_DataType[] _input_types => _inputs_val._inputs.Select(x => x.dtype).ToArray();
40	40
41	41	protected InputList _inputs_val;
Original file line number	Diff line number	Diff line change
@@ -23,7 +23,7 @@ namespace Tensorflow
23	23	{
24	24	public partial class Operation
25	25	{
26		- public int NumOutputs => c_api.TF_OperationNumOutputs(_handle);
	26	+ public int NumOutputs => _handle == IntPtr.Zero ? -1 : c_api.TF_OperationNumOutputs(_handle);
27	27	public TF_DataType OutputType(int index) => c_api.TF_OperationOutputType(_tf_output(index));
28	28
29	29	public int OutputListLength(string name)
@@ -38,7 +38,7 @@ public int OutputListLength(string name)
38	38	public virtual Tensor[] outputs => _outputs;
39	39	public Tensor output => _outputs.FirstOrDefault();
40	40
41		- public int NumControlOutputs => c_api.TF_OperationNumControlOutputs(_handle);
	41	+ public int NumControlOutputs => _handle == IntPtr.Zero ? -1 : c_api.TF_OperationNumControlOutputs(_handle);
42	42
43	43	public int OutputNumConsumers(int index) => c_api.TF_OperationOutputNumConsumers(new TF_Output(_handle, index));
44	44
Original file line number	Diff line number	Diff line change
@@ -39,9 +39,12 @@ public Tensor()
39	39	/// Create a Tensor object from an existing TF handle
40	40	/// </summary>
41	41	/// <param name="handle">Handle to a <see cref="Tensor"/> object.</param>
42		- public Tensor(SafeTensorHandle handle)
	42	+ public unsafe Tensor(SafeTensorHandle handle, bool clone = false)
43	43	{
44	44	_handle = handle;
	45	+ if (clone)
	46	+ _handle = TF_NewTensor(shape, dtype, data: TensorDataPointer.ToPointer());
	47	+
45	48	isCreatedInGraphMode = !tf.executing_eagerly();
46	49	}
47	50
Original file line number	Diff line number	Diff line change
@@ -55,7 +55,7 @@ protected NDArray GetNDArray(TF_DataType dtype)
55	55	return new NDArray(str, shape);
56	56	}
57	57
58		- return new NDArray(this);
	58	+ return new NDArray(this, clone: true);
59	59	}
60	60
61	61	/// <summary>