diff --git a/src/formal/gradient_2D_s.F90 b/src/formal/gradient_2D_s.F90
index 3115525..2fa9cd7 100644
--- a/src/formal/gradient_2D_s.F90
+++ b/src/formal/gradient_2D_s.F90
@@ -29,14 +29,15 @@
 
      call_julienne_assert(lhs%consistent())
 
-     !     points = [points_2D_t(lhs%points_(x_dir,1,1,1)%values_*rhs), points_2D_t(lhs%points_(y_dir,1,1,1)%values_*rhs)] &
-
-     associate(test_dummy => reshape([1],[1,1]))
-
      product%vector_2D_t = vector_2D_t( &
-        !tensor_2D_t( &
-        construct_2D_tensor_from_components( &
-           points = reshape([points_2D_t(test_dummy*rhs), points_2D_t(test_dummy*rhs)], shape=[space_dimension,1,1,1]) &
+        tensor_2D_t( &
+           points = reshape( &
+              source = [ &
+                 points_2D_t(lhs%points_(x_dir,1,1,1)%values_*rhs) &
+                ,points_2D_t(lhs%points_(y_dir,1,1,1)%values_*rhs) &
+              ] &
+             ,shape = [space_dimension,1,1,1] &
+           ) &
           ,cells = lhs%cells_ &
           ,x_min = lhs%x_min_ &
           ,x_max = lhs%x_max_ &
@@ -45,8 +46,6 @@
        ,divergence_operator_1D_t(k=lhs%order_, cells=lhs%cells_, dx=(lhs%x_max_ - lhs%x_min_)/lhs%cells_) &
      )
 
-     end associate
-
      call_julienne_assert(product%consistent())
 
   end procedure