diff --git a/BrainPortal/lib/boutiques_input_subdir_maker.rb b/BrainPortal/lib/boutiques_input_subdir_maker.rb
index c0549c26b..c0af297fd 100644
--- a/BrainPortal/lib/boutiques_input_subdir_maker.rb
+++ b/BrainPortal/lib/boutiques_input_subdir_maker.rb
@@ -190,9 +190,20 @@ def finalize_bosh_invoke_struct(invoke_struct) #:nodoc:
         override_invoke_params.delete(inputid)
       else
         dirname              = subdir_config["dirname"]
-        filename             = subdir_config["filename"] || "#{override_invoke_params[inputid]}"
+        filename             = subdir_config["filename"]
         append_userfile_name = subdir_config["append_filename"]
-        override_invoke_params[inputid] = append_userfile_name ? "#{dirname}/#{filename}" : dirname
+        new_value = if override_invoke_params[inputid].is_a?(String)
+                      filename ||= "#{override_invoke_params[inputid]}"
+                      append_userfile_name ? "#{dirname}/#{filename}" : dirname
+                    elsif filename || ! append_userfile_name   # handing input filelist
+                      [append_userfile_name ? "#{dirname}/#{filename}" : dirname]
+                    else
+                      override_invoke_params[inputid].map do |filename|
+                        "#{dirname}/#{filename}"
+                      end
+                    end
+
+        override_invoke_params[inputid] = new_value
       end
     end