diff --git a/src/TNL/Cuda/LaunchHelpers.h b/src/TNL/Cuda/LaunchHelpers.h
index 2b7113f43268864e8470ef3596a68b290c89cbf0..a9e8bc1683111b75312e5e334391a0192be22b2f 100644
--- a/src/TNL/Cuda/LaunchHelpers.h
+++ b/src/TNL/Cuda/LaunchHelpers.h
@@ -15,9 +15,11 @@
 namespace TNL {
 namespace Cuda {
 
-inline constexpr size_t getMaxGridSize()
+// TODO: the max grid size depends on the axis: (x,y,z): (2147483647, 65535, 65535)
+// see https://mmg-gitlab.fjfi.cvut.cz/gitlab/tnl/tnl-dev/-/issues/4
+inline constexpr std::size_t getMaxGridSize()
 {
-   return 2147483647;//65535;
+   return 65535;
 }
 
 inline constexpr int getMaxBlockSize()