diff --git a/src/TensorFlowNET.Core/Operations/gen_math_ops.cs b/src/TensorFlowNET.Core/Operations/gen_math_ops.cs
index 5c3bcf72..c1257e19 100644
--- a/src/TensorFlowNET.Core/Operations/gen_math_ops.cs
+++ b/src/TensorFlowNET.Core/Operations/gen_math_ops.cs
@@ -141,7 +141,7 @@ namespace Tensorflow
         {
             var _op = _op_def_lib._apply_op_helper("Add", name, args: new { x, y });
 
-            return _op.outputs[0];
+            return _op.output;
         }
 
         public static Tensor atan(Tensor x, string name = null)
diff --git a/src/TensorFlowNET.Core/Operations/gen_random_ops.py.cs b/src/TensorFlowNET.Core/Operations/gen_random_ops.py.cs
index 8fe9ba71..06ae70a3 100644
--- a/src/TensorFlowNET.Core/Operations/gen_random_ops.py.cs
+++ b/src/TensorFlowNET.Core/Operations/gen_random_ops.py.cs
@@ -40,7 +40,7 @@ namespace Tensorflow
                 name: name,
                 args: new { shape, dtype, seed, seed2 });
 
-            return _op.outputs[0];
+            return _op.output;
         }
 
         /// <summary>
diff --git a/src/TensorFlowNET.Core/Operations/random_ops.py.cs b/src/TensorFlowNET.Core/Operations/random_ops.py.cs
index 9ca4db88..02e522bf 100644
--- a/src/TensorFlowNET.Core/Operations/random_ops.py.cs
+++ b/src/TensorFlowNET.Core/Operations/random_ops.py.cs
@@ -39,9 +39,10 @@ namespace Tensorflow
         {
             return tf_with(ops.name_scope(name, "random_normal", new { shape, mean, stddev }), scope =>
             {
+                name = scope;
                 var shape_tensor = _ShapeTensor(shape);
                 var mean_tensor = ops.convert_to_tensor(mean, dtype: dtype, name: "mean");
-                var stddev_tensor = ops.convert_to_tensor(stddev, dtype: dtype, name = "stddev");
+                var stddev_tensor = ops.convert_to_tensor(stddev, dtype: dtype, name: "stddev");
                 var (seed1, seed2) = random_seed.get_seed(seed);
                 var rnd = gen_random_ops.random_standard_normal(shape_tensor, dtype: dtype, seed: seed1, seed2: seed2);
                 var mul = rnd * stddev_tensor;