diff --git a/Grid/qcd/utils/A2Autils.h b/Grid/qcd/utils/A2Autils.h
index d5feb275..da4fac22 100644
--- a/Grid/qcd/utils/A2Autils.h
+++ b/Grid/qcd/utils/A2Autils.h
@@ -178,7 +178,7 @@ void A2Autils<FImpl>::NucleonFieldMom(Eigen::Tensor<ComplexD,6> &mat,
 	for(int i=0;i<oneBlock;i++){
 
 	  auto v1 = one[i]._odata[ss];
-	  auto pv1 = 0.5*(double)parity*(v1 + Gamma(Gamma::Algebra::GammaT)*v1); 
+	  auto pv1 = 0.5*(v1 + (double)parity*Gamma(Gamma::Algebra::GammaT)*v1); 
 
        	  for(int j=0;j<twoBlock;j++){
 
@@ -190,14 +190,16 @@ void A2Autils<FImpl>::NucleonFieldMom(Eigen::Tensor<ComplexD,6> &mat,
               // C = i gamma_2 gamma_4 => C gamma_5 = - i gamma_1 gamma_3
 	      auto gv3 = Gamma(Gamma::Algebra::SigmaXZ) * v3;
 	      SpinVector_v vv;
-            
-	      vv()()() =  pv1()()(0) * v2()()(1) * gv3()()(2)   //Cross product
-                -         pv1()()(0) * v2()()(2) * gv3()()(1)    
-                +         pv1()()(1) * v2()()(2) * gv3()()(0)    
-                -         pv1()()(1) * v2()()(0) * gv3()()(2)    
-                +         pv1()()(2) * v2()()(0) * gv3()()(1)    
-                -         pv1()()(2) * v2()()(1) * gv3()()(0);    
 
+              for(int s1=0;s1<Ns;s1++){
+	      for(int s2=0;s2<Ns;s2++){            
+	        vv()(s1)() =  pv1()(s1)(0) * v2()(s2)(1) * gv3()(s2)(2)   //Cross product
+                  -           pv1()(s1)(0) * v2()(s2)(2) * gv3()(s2)(1)    
+                  +           pv1()(s1)(1) * v2()(s2)(2) * gv3()(s2)(0)    
+                  -           pv1()(s1)(1) * v2()(s2)(0) * gv3()(s2)(2)    
+                  +           pv1()(s1)(2) * v2()(s2)(0) * gv3()(s2)(1)    
+                  -           pv1()(s1)(2) * v2()(s2)(1) * gv3()(s2)(0);    
+              }}
 	    
 	      // After getting the sitewise product do the mom phase loop
               int base = Nmom*i+Nmom*oneBlock*j+Nmom*oneBlock*twoBlock*k+Nmom*oneBlock*twoBlock*threeBlock*r;