diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
index 4abbf5ef68522c2a7c66532e6716ed3caeb37958..89550916228cc5bfdb54197d2fb2183fe94ab519 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
@@ -2289,7 +2289,7 @@ def _generate_subtask_specs_from_preprocessing_task_specs(preprocessing_task_spe
     subtask_specs = default_subtask_specs
     subtask_specs['storagemanager'] = preprocessing_task_specs['storagemanager']
     subtask_specs['cluster_resources'] = preprocessing_task_specs['cluster_resources']
-    if 'software_version' in subtask_specs:
+    if 'software_version' in preprocessing_task_specs:
         subtask_specs['software_version'] = preprocessing_task_specs['software_version']
 
     # averaging (performed by the demixer)
@@ -2329,7 +2329,7 @@ def _generate_subtask_specs_from_preprocessing_task_specs(preprocessing_task_spe
 def _generate_subtask_specs_from_pulsar_pipeline_task_specs(pipeline_task_specs, default_subtask_specs):
     subtask_specs = {}
     subtask_specs['cluster_resources'] = pipeline_task_specs['cluster_resources']
-    if 'software_version' in subtask_specs:
+    if 'software_version' in pipeline_task_specs:
         subtask_specs['software_version'] = pipeline_task_specs['software_version']
 
     # Pulsar to fold