diff --git a/extras/Hadrons/Modules/MScalarSUN/EMT.hpp b/extras/Hadrons/Modules/MScalarSUN/EMT.hpp
index 850efe6a..8c1239df 100644
--- a/extras/Hadrons/Modules/MScalarSUN/EMT.hpp
+++ b/extras/Hadrons/Modules/MScalarSUN/EMT.hpp
@@ -110,7 +110,7 @@ std::vector<std::string> TEMT<SImpl>::getInput(void)
 template <typename SImpl>
 std::vector<std::string> TEMT<SImpl>::getOutput(void)
 {
-    std::vector<std::string> out = {getName()};
+    std::vector<std::string> out;
     
     for (unsigned int mu = 0; mu < env().getNd(); ++mu)
     for (unsigned int nu = mu; nu < env().getNd(); ++nu)
@@ -125,7 +125,11 @@ std::vector<std::string> TEMT<SImpl>::getOutput(void)
 template <typename SImpl>
 void TEMT<SImpl>::setup(void)
 {
-    envCreateLat(ComplexField, getName());
+    for (unsigned int mu = 0; mu < env().getNd(); ++mu)
+    for (unsigned int nu = mu; nu < env().getNd(); ++nu)
+    {
+        envCreateLat(ComplexField, varName(getName(), mu, nu));
+    }
     envTmpLat(ComplexField, "sumkin");
 }
 
diff --git a/extras/Hadrons/Modules/MScalarSUN/TransProj.hpp b/extras/Hadrons/Modules/MScalarSUN/TransProj.hpp
index 09386cea..4532b4ab 100644
--- a/extras/Hadrons/Modules/MScalarSUN/TransProj.hpp
+++ b/extras/Hadrons/Modules/MScalarSUN/TransProj.hpp
@@ -104,7 +104,7 @@ std::vector<std::string> TTransProj<SImpl>::getInput(void)
 template <typename SImpl>
 std::vector<std::string> TTransProj<SImpl>::getOutput(void)
 {
-    std::vector<std::string> out = {getName()};
+    std::vector<std::string> out;
     
     for (unsigned int mu = 0; mu < env().getNd(); ++mu)
     for (unsigned int nu = mu; nu < env().getNd(); ++nu)