diff --git a/src/kernel/Makefile b/src/kernel/Makefile
index 0165846f..463d6047 100644
--- a/src/kernel/Makefile
+++ b/src/kernel/Makefile
@@ -1090,7 +1090,7 @@ single-stencil-tests:
 	$(MAKE) clean; $(STENCIL_TEST) stencil=test_empty_2d
 	$(MAKE) clean; $(STENCIL_TEST) stencil=test_2d YK_STENCIL_SUFFIX=-t1 $(call FOLD,x=2 y=2) inner_loop_dim=1
 	$(MAKE) clean; $(STENCIL_TEST) stencil=test_2d YK_STENCIL_SUFFIX=-t2 $(call FOLD,x=2 y=2) inner_loop_dim=2
-	$(MAKE) clean; $(STENCIL_TEST) stencil=test_2d YK_STENCIL_SUFFIX=-t3 arch=intel64 $(call FOLD,x=3 y=2) domain_dims=y,x YK_CXX=g++ mpi=0
+	$(MAKE) clean; $(STENCIL_TEST) stencil=test_2d YK_STENCIL_SUFFIX=-t3 arch=intel64 $(call FOLD,x=3 y=2) domain_dims=y,x
 	$(MAKE) clean; $(STENCIL_TEST) stencil=test_reverse_2d YK_STENCIL_SUFFIX=-t1 radius=1
 	$(MAKE) clean; $(STENCIL_TEST) stencil=test_stages_2d $(call FOLD,x=2 y=2)
 	$(MAKE) clean; $(STENCIL_TEST) stencil=test_misc_2d YK_STENCIL_SUFFIX=-t1 $(call FOLD,x=2 y=2) inner_misc_layout=0 outer_domain_layout=0
diff --git a/src/kernel/lib/generic_var.cpp b/src/kernel/lib/generic_var.cpp
index 48709061..9df2ac4b 100644
--- a/src/kernel/lib/generic_var.cpp
+++ b/src/kernel/lib/generic_var.cpp
@@ -146,7 +146,6 @@ namespace yask {
                                   const T v = val;
                                   T* RESTRICT e = elems;
 
-                                  #pragma omp simd
                                   for (idx_t i = start; i < stop; i++)
                                       e[i] = v;
                               });
@@ -179,9 +178,11 @@ namespace yask {
                                   T* RESTRICT e = elems;
                                   const T s = seed;
                                   
-                                  #pragma omp simd
-                                  for (idx_t i = start; i < stop; i++)
-                                      e[i] = s * T(imod_flr(i, wrap) + 1);
+                                  for (idx_t i = start; i < stop; i++) {
+                                      T v = s * T(imod_flr(i, wrap) + 1);
+                                      e[i] = v;
+                                      //cout << "e["<<i<<"] = "<< v <<endl;
+                                  }
                               });
 
             // Also update the version on the device to the same sequence.