diff --git a/cudampilib/apps/collatz/app-streams-collatz.c b/cudampilib/apps/collatz/app-streams-collatz.c
index efa1dd8..c2bc1b0 100644
--- a/cudampilib/apps/collatz/app-streams-collatz.c
+++ b/cudampilib/apps/collatz/app-streams-collatz.c
@@ -25,7 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 struct __cudampi__arguments_type __cudampi__arguments;
 
-long long VECTORSIZE = COLLATZ_VECTORSIZE;
+long long VECTORSIZE;
 
 double *vectora;
 double *vectorc;
@@ -48,6 +48,7 @@ int main(int argc, char **argv)
 
   streamcount = __cudampi__arguments.number_of_streams;
   batchsize = __cudampi__arguments.batch_size;
+  VECTORSIZE = __cudampi__arguments.problem_size;
 
   int alldevicescount = 0;
 
diff --git a/cudampilib/apps/patternsearch/app-streams-patternsearch.c b/cudampilib/apps/patternsearch/app-streams-patternsearch.c
index 45b3410..419d77c 100644
--- a/cudampilib/apps/patternsearch/app-streams-patternsearch.c
+++ b/cudampilib/apps/patternsearch/app-streams-patternsearch.c
@@ -25,7 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 struct __cudampi__arguments_type __cudampi__arguments;
 
-long long VECTORSIZE = PATTERNSEARCH_VECTORSIZE;
+long long VECTORSIZE;
 
 char *vectora;
 char *vectorc;
@@ -49,6 +49,7 @@ int main(int argc, char **argv)
 
   streamcount = __cudampi__arguments.number_of_streams;
   batchsize = __cudampi__arguments.batch_size;
+  VECTORSIZE = __cudampi__arguments.problem_size;
 
   int alldevicescount = 0;
 
diff --git a/cudampilib/apps/vecadd/app-streams-vecadd.c b/cudampilib/apps/vecadd/app-streams-vecadd.c
index 4ddf51d..076e083 100644
--- a/cudampilib/apps/vecadd/app-streams-vecadd.c
+++ b/cudampilib/apps/vecadd/app-streams-vecadd.c
@@ -24,7 +24,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 struct __cudampi__arguments_type __cudampi__arguments;
 
-long long VECTORSIZE = VECADD_VECTOR_SIZE;
+long long VECTORSIZE;
 
 double *vectora;
 double *vectorb;
@@ -48,6 +48,7 @@ int main(int argc, char **argv)
 
   streamcount = __cudampi__arguments.number_of_streams;
   batchsize = __cudampi__arguments.batch_size;
+  VECTORSIZE = __cudampi__arguments.problem_size;
 
   int alldevicescount = 0;
 
diff --git a/cudampilib/apps/vecmaxdiv/app-streams-vecmaxdiv.c b/cudampilib/apps/vecmaxdiv/app-streams-vecmaxdiv.c
index 6569fb1..a541e0a 100644
--- a/cudampilib/apps/vecmaxdiv/app-streams-vecmaxdiv.c
+++ b/cudampilib/apps/vecmaxdiv/app-streams-vecmaxdiv.c
@@ -26,7 +26,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 
 struct __cudampi__arguments_type __cudampi__arguments;
 
-long long VECTORSIZE = VECMAXDIV_VECTORSIZE;
+long long VECTORSIZE;
 
 double *vectora;
 double *vectorb;
@@ -50,6 +50,7 @@ int main(int argc, char **argv)
 
   streamcount = __cudampi__arguments.number_of_streams;
   batchsize = __cudampi__arguments.batch_size;
+  VECTORSIZE = __cudampi__arguments.problem_size;
 
   int alldevicescount = 0;