diff --git a/.zenodo.json b/.zenodo.json
index 7324bd942c..cb9ffacc3c 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -487,7 +487,7 @@
       "name": "Perkins, L. Nathan"
     },
     {
-      "affiliation": "Otto-von-Guericke-University Magdeburg, Germany",
+      "affiliation": "Max Planck Institute for Human Cognitive and Brain Sciences",
       "name": "Contier, Oliver",
       "orcid": "0000-0002-2983-4709"
     },
diff --git a/nipype/interfaces/fsl/epi.py b/nipype/interfaces/fsl/epi.py
index e5dbe6de19..f6772aa53b 100644
--- a/nipype/interfaces/fsl/epi.py
+++ b/nipype/interfaces/fsl/epi.py
@@ -1306,20 +1306,19 @@ def _list_outputs(self):
             outputs["epi2str_inv"] = os.path.join(
                 os.getcwd(), self.inputs.out_base + "_inv.mat"
             )
-
+        if not isdefined(self.inputs.wmseg):
+            outputs["wmedge"] = os.path.join(
+                os.getcwd(), self.inputs.out_base + "_fast_wmedge.nii.gz"
+            )
+            outputs["wmseg"] = os.path.join(
+                os.getcwd(), self.inputs.out_base + "_fast_wmseg.nii.gz"
+            )
+            outputs["seg"] = os.path.join(
+                os.getcwd(), self.inputs.out_base + "_fast_seg.nii.gz"
+            )
         outputs["epi2str_mat"] = os.path.join(
             os.getcwd(), self.inputs.out_base + ".mat"
         )
-        outputs["wmedge"] = os.path.join(
-            os.getcwd(), self.inputs.out_base + "_fast_wmedge.nii.gz"
-        )
-        outputs["wmseg"] = os.path.join(
-            os.getcwd(), self.inputs.out_base + "_fast_wmseg.nii.gz"
-        )
-        outputs["seg"] = os.path.join(
-            os.getcwd(), self.inputs.out_base + "_fast_seg.nii.gz"
-        )
-
         return outputs