diff --git a/steps/find_skymodel_cal.cwl b/steps/find_skymodel_cal.cwl
index ca8b2288be375eeedff5e6306a6faaa49e9f2dee..0ad1dee4142b7d9fe20ffb4b27fdcd4cff069adf 100644
--- a/steps/find_skymodel_cal.cwl
+++ b/steps/find_skymodel_cal.cwl
@@ -7,7 +7,9 @@ baseCommand:
   - python3
 inputs:
     - id: msin
-      type: Directory[]
+      type: 
+       - Directory
+       - Directory[]
       doc: MS containing the calibrator
       inputBinding:
         position: 0
diff --git a/steps/selectfirstdirectory.cwl b/steps/selectfirstdirectory.cwl
index d214353f659e1f27f22279fdbdfa428ada2557f0..c4ecb01874588d841d2080a853e0ee6f8d716619 100644
--- a/steps/selectfirstdirectory.cwl
+++ b/steps/selectfirstdirectory.cwl
@@ -11,6 +11,8 @@ outputs:
       type: Directory
 
 requirements:
+
+    - class: InlineJavascriptRequirement
     - class: InitialWorkDirRequirement
       listing:
         - $(inputs.input)
@@ -21,6 +23,3 @@ expression: |
     return {'output': inputs.input[0]}
   }
 
-
-requirements:
-  - class: InlineJavascriptRequirement