diff --git a/complex.cpp b/complex.cpp
index 6743e41e..b4f9f077 100644
--- a/complex.cpp
+++ b/complex.cpp
@@ -3389,7 +3389,7 @@ EX namespace windmap {
       // cw.spin = 0;
       neighbors.emplace_back();
       auto &v = neighbors.back();
-      if(NONSTDVAR && !sphere && !archimedean)
+      if(NONSTDVAR && !sphere && !archimedean && !prod)
         for(int l=0; l<S7; l++) {
           v.push_back(getId(cw + cth + l + wstep + cth));
           }
diff --git a/pattern2.cpp b/pattern2.cpp
index 2271c645..f6ad7938 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -372,7 +372,12 @@ EX pair<int, bool> fieldval(cell *c) {
 
 EX int fieldval_uniq(cell *c) {
   if(experimental) return 0;
-  else if(prod) { auto c1 = product::get_where(c).first; return PIU(fieldval_uniq(c1)); }
+  else if(prod) { 
+    auto c1 = product::get_where(c).first; 
+    int res;
+    product::in_underlying_map([&] { res = fieldval_uniq(c1); });
+    return res; 
+    }
   else if(sphere) {
     if(archimedean) return c->master->fiftyval;
     #if CAP_IRR