diff --git a/src/mesh/MeshData.hpp b/src/mesh/MeshData.hpp
index 56d98058c84c2ca9f01b60c6b7f8bfed47425410..5e0aa268f2d75ecf16ee8f119bc646e4b17aa114 100644
--- a/src/mesh/MeshData.hpp
+++ b/src/mesh/MeshData.hpp
@@ -90,12 +90,12 @@ private:
 
       const NodeByCellData<Rd>& Cjr = m_Cjr;
       Kokkos::parallel_for(m_Cjr.numberOfValues(), KOKKOS_LAMBDA(const int& j){
-          m_ljr.value(j) = l2Norm(Cjr.value(j));
+          m_ljr[j] = l2Norm(Cjr[j]);
         });
 
       const NodeByCellData<double>& ljr = m_ljr;
       Kokkos::parallel_for(m_Cjr.numberOfValues(), KOKKOS_LAMBDA(const int& j){
-          m_njr.value(j) = (1./ljr.value(j))*Cjr.value(j);
+          m_njr[j] = (1./ljr[j])*Cjr[j];
         });
 
     } else if (dimension ==3) {
@@ -151,12 +151,12 @@ private:
 
       const NodeByCellData<Rd>& Cjr = m_Cjr;
       Kokkos::parallel_for(m_Cjr.numberOfValues(), KOKKOS_LAMBDA(const int& j){
-          m_ljr.value(j) = l2Norm(Cjr.value(j));
+          m_ljr[j] = l2Norm(Cjr[j]);
         });
 
       const NodeByCellData<double>& ljr = m_ljr;
       Kokkos::parallel_for(m_Cjr.numberOfValues(), KOKKOS_LAMBDA(const int& j){
-          m_njr.value(j) = (1./ljr.value(j))*Cjr.value(j);
+          m_njr[j] = (1./ljr[j])*Cjr[j];
         });
     }
     static_assert((dimension<=3), "only 1d, 2d and 3d are implemented");
diff --git a/src/scheme/NodeByCellData.hpp b/src/scheme/NodeByCellData.hpp
index 4659ec148f673b1d20216806fa178c70d02bad6c..fd99cdcff3a039223160490f9ae28f8987d873fa 100644
--- a/src/scheme/NodeByCellData.hpp
+++ b/src/scheme/NodeByCellData.hpp
@@ -30,7 +30,7 @@ class NodeByCellData
       return m_sub_values[i];
     }
 
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_FORCEINLINE_FUNCTION
     DataType& operator[](const size_t& i)
     {
       Assert(i<m_size);
@@ -66,7 +66,7 @@ class NodeByCellData
     KOKKOS_RESTRICT const DataType* const m_sub_values;
     const size_t m_size;
    public:
-    KOKKOS_INLINE_FUNCTION
+    KOKKOS_FORCEINLINE_FUNCTION
     const DataType& operator[](const size_t& i) const
     {
       Assert(i<m_size);
@@ -98,13 +98,13 @@ class NodeByCellData
 
   NodeByCellData& operator=(const NodeByCellData&) = default;
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_FORCEINLINE_FUNCTION
   DataType& operator()(const size_t& j, const size_t& r)
   {
     return m_values[m_node_id_per_cell_matrix.row_map[j]+r];
   }
 
-  KOKKOS_INLINE_FUNCTION
+  KOKKOS_FORCEINLINE_FUNCTION
   const DataType& operator()(const size_t& j, const size_t& r) const
   {
     return m_values[m_node_id_per_cell_matrix.row_map[j]+r];
@@ -116,14 +116,14 @@ class NodeByCellData
     return m_values.extent(0);
   }
 
-  KOKKOS_INLINE_FUNCTION
-  DataType& value(const size_t& i)
+  KOKKOS_FORCEINLINE_FUNCTION
+  DataType& operator[](const size_t& i)
   {
     return m_values[i];
   }
 
-  KOKKOS_INLINE_FUNCTION
-  const DataType& value(const size_t & i) const
+  KOKKOS_FORCEINLINE_FUNCTION
+  const DataType& operator[](const size_t & i) const
   {
     return m_values[i];
   }