diff --git a/app/models/submission.rb b/app/models/submission.rb
index 7c38c9aa0..e93c722b4 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -248,8 +248,7 @@ def swap_runner(old_runner)
     [new_runner, new_waiting_duration]
   end
 
-  def command_for(template, file)
-    filepath = collect_files.find {|f| f.filepath == file }.filepath
+  def command_for(template, filepath)
     template % command_substitutions(filepath)
   end