diff --git a/driver/tests/demo/common.h b/driver/tests/demo/common.h
index 813d393e..8241b476 100644
--- a/driver/tests/demo/common.h
+++ b/driver/tests/demo/common.h
@@ -3,6 +3,8 @@
 
 #include "../../../runtime/config.h"
 
+#define MAX_CORES NUMBER_CORES
+
 #define MAX_WARPS NW
 
 #define MAX_THREADS NT
diff --git a/driver/tests/demo/demo b/driver/tests/demo/demo
index ea68ec16..b9a78efd 100755
Binary files a/driver/tests/demo/demo and b/driver/tests/demo/demo differ
diff --git a/driver/tests/demo/demo.cpp b/driver/tests/demo/demo.cpp
index 763c67b7..e1b57379 100644
--- a/driver/tests/demo/demo.cpp
+++ b/driver/tests/demo/demo.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *argv[]) {
   kernel_arg_t kernel_arg;
 
   uint32_t stride = BLOCK_SIZE / sizeof(uint32_t);
-  uint32_t num_points = MAX_WARPS * MAX_THREADS * stride;
+  uint32_t num_points = MAX_CORES * MAX_WARPS * MAX_THREADS * stride;
   uint32_t buf_size = num_points * sizeof(uint32_t);
   
   // parse command arguments